icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.15

Browse Source
This commit is contained in:
gnembon committed 2019-12-11 00:04:38 -04:00
1 parent 8f9dd66cdf
commit d279696c18
6 files changed
+11 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+2 -2
View File
@@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
# or better: https://modmuss50.me/fabric.html # or better: https://modmuss50.me/fabric.html
minecraft_version=1.15-pre7 minecraft_version=1.15
yarn_mappings=1.15-pre7+build.1 yarn_mappings=1.15+build.1
loader_version=0.7.2+build.174 loader_version=0.7.2+build.174
# Mod Properties # Mod Properties
src/main/java/carpet/helpers/FeatureGenerator.java
+5 -5
View File
@@ -19,7 +19,7 @@ import net.minecraft.world.gen.chunk.OverworldChunkGeneratorConfig;
import net.minecraft.world.gen.decorator.BeehiveTreeDecorator; import net.minecraft.world.gen.decorator.BeehiveTreeDecorator;
import net.minecraft.world.gen.feature.BoulderFeatureConfig; import net.minecraft.world.gen.feature.BoulderFeatureConfig;
import net.minecraft.world.gen.feature.BranchedTreeFeatureConfig; import net.minecraft.world.gen.feature.BranchedTreeFeatureConfig;
import net.minecraft.world.gen.feature.BushFeatureConfig; import net.minecraft.world.gen.feature.SingleStateFeatureConfig;
import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.ConfiguredFeature;
import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.DefaultFeatureConfig;
import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.Feature;
@@ -177,10 +177,10 @@ public class FeatureGenerator
put("sugarcane", simplePatch(DefaultBiomeFeatures.SUGAR_CANE_CONFIG)); put("sugarcane", simplePatch(DefaultBiomeFeatures.SUGAR_CANE_CONFIG));
put("lilypad", simplePatch(DefaultBiomeFeatures.LILY_PAD_CONFIG)); put("lilypad", simplePatch(DefaultBiomeFeatures.LILY_PAD_CONFIG));
put("dungeon", simplePlop(Feature.MONSTER_ROOM)); put("dungeon", simplePlop(Feature.MONSTER_ROOM));
put("iceberg", simplePlop(Feature.ICEBERG.configure(new BushFeatureConfig(Blocks.PACKED_ICE.getDefaultState())))); put("iceberg", simplePlop(Feature.ICEBERG.configure(new SingleStateFeatureConfig(Blocks.PACKED_ICE.getDefaultState()))));
put("iceberg_blue", simplePlop(Feature.ICEBERG.configure(new BushFeatureConfig(Blocks.BLUE_ICE.getDefaultState())))); put("iceberg_blue", simplePlop(Feature.ICEBERG.configure(new SingleStateFeatureConfig(Blocks.BLUE_ICE.getDefaultState()))));
put("lake", simplePlop(Feature.LAKE.configure(new BushFeatureConfig(Blocks.WATER.getDefaultState())))); put("lake", simplePlop(Feature.LAKE.configure(new SingleStateFeatureConfig(Blocks.WATER.getDefaultState()))));
put("lake_lava", simplePlop(Feature.LAKE.configure(new BushFeatureConfig(Blocks.LAVA.getDefaultState())))); put("lake_lava", simplePlop(Feature.LAKE.configure(new SingleStateFeatureConfig(Blocks.LAVA.getDefaultState()))));
//put("end tower", simplePlop(Feature.END_SPIKE.configure(new EndSpikeFeatureConfig(false, )))); //put("end tower", simplePlop(Feature.END_SPIKE.configure(new EndSpikeFeatureConfig(false, ))));
put("end_island", simplePlop(Feature.END_ISLAND)); put("end_island", simplePlop(Feature.END_ISLAND));
put("chorus", simplePlop(Feature.CHORUS_PLANT)); put("chorus", simplePlop(Feature.CHORUS_PLANT));
src/main/java/carpet/mixins/BiomeArray_getBiomeArrayMixin.java
+1 -1
View File
@@ -1,7 +1,7 @@
package carpet.mixins; package carpet.mixins;
import carpet.fakes.BiomeArrayInterface; import carpet.fakes.BiomeArrayInterface;
import carpet.settings.CarpetSettings; import carpet.CarpetSettings;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraft.world.World; import net.minecraft.world.World;
src/main/java/carpet/mixins/PlayerEntity_antiCheatDisabled.java
+1 -1
View File
@@ -1,7 +1,7 @@
package carpet.mixins; package carpet.mixins;
import carpet.CarpetServer; import carpet.CarpetServer;
import carpet.settings.CarpetSettings; import carpet.CarpetSettings;
import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.EquipmentSlot;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ElytraItem; import net.minecraft.item.ElytraItem;
src/main/java/carpet/mixins/ServerPlayerInteractionManager_antiCheatMixin.java
+1 -9
View File
@@ -1,20 +1,12 @@
package carpet.mixins; package carpet.mixins;
import carpet.settings.CarpetSettings; import carpet.CarpetSettings;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.network.ServerPlayerInteractionManager; import net.minecraft.server.network.ServerPlayerInteractionManager;
import net.minecraft.server.network.packet.PlayerActionC2SPacket;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.BlockView;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.Constant;
import org.spongepowered.asm.mixin.injection.ModifyConstant; import org.spongepowered.asm.mixin.injection.ModifyConstant;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(ServerPlayerInteractionManager.class) @Mixin(ServerPlayerInteractionManager.class)
public class ServerPlayerInteractionManager_antiCheatMixin public class ServerPlayerInteractionManager_antiCheatMixin
src/main/java/carpet/mixins/World_scarpetPlopMixin.java
+1 -1
View File
@@ -1,6 +1,6 @@
package carpet.mixins; package carpet.mixins;
import carpet.settings.CarpetSettings; import carpet.CarpetSettings;
import net.minecraft.world.Heightmap; import net.minecraft.world.Heightmap;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraft.world.chunk.WorldChunk; import net.minecraft.world.chunk.WorldChunk;