diff --git a/src/main/java/carpetextra/CarpetExtraSettings.java b/src/main/java/carpetextra/CarpetExtraSettings.java index 76475d54..25976b0c 100644 --- a/src/main/java/carpetextra/CarpetExtraSettings.java +++ b/src/main/java/carpetextra/CarpetExtraSettings.java @@ -167,13 +167,6 @@ public Integer validate(ServerCommandSource source, ParsedRule currentR @Rule(desc = "Disables player entity collision.", category = {EXTRA, CREATIVE, EXPERIMENTAL}) public static boolean disablePlayerCollision = false; - @Rule( - desc = "Obsidian surrounded by 6 lava sources has a chance of converting to lava.", - category = {EXTRA, EXPERIMENTAL, FEATURE}, - extra = "Credits: Skyrising" - ) - public static boolean renewableLava = false; - @Rule( desc = "Re-adds 1.8 double retraction to pistons.", category = {EXTRA, EXPERIMENTAL}, diff --git a/src/main/java/carpetextra/helpers/ObsidianBlock.java b/src/main/java/carpetextra/helpers/ObsidianBlock.java deleted file mode 100644 index 68c9260c..00000000 --- a/src/main/java/carpetextra/helpers/ObsidianBlock.java +++ /dev/null @@ -1,43 +0,0 @@ -package carpetextra.helpers; - -import carpetextra.CarpetExtraSettings; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.fluid.FluidState; -import net.minecraft.fluid.Fluids; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; - -import java.util.Random; - -// Credits: Skyrising -public class ObsidianBlock extends Block -{ - public ObsidianBlock(Settings settings) - { - super(settings); - } - - @Override - public boolean hasRandomTicks(BlockState state) - { - return CarpetExtraSettings.renewableLava; - } - - @Override - public void randomTick(BlockState blockState_1, ServerWorld serverWorld_1, BlockPos blockPos_1, Random random_1) - { - for (Direction dir : Direction.values()) - { - FluidState neighbor = serverWorld_1.getFluidState(blockPos_1.offset(dir)); - if (neighbor.getFluid() != Fluids.LAVA || !neighbor.isStill()) - return; - } - if (random_1.nextInt(10) == 0) - { - serverWorld_1.setBlockState(blockPos_1, Blocks.LAVA.getDefaultState()); - } - } -} diff --git a/src/main/java/carpetextra/mixins/BlocksMixin.java b/src/main/java/carpetextra/mixins/BlocksMixin.java deleted file mode 100644 index 62bee09b..00000000 --- a/src/main/java/carpetextra/mixins/BlocksMixin.java +++ /dev/null @@ -1,32 +0,0 @@ -package carpetextra.mixins; - -import carpetextra.helpers.ObsidianBlock; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.block.MapColor; -import net.minecraft.block.Material; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; -import org.spongepowered.asm.mixin.injection.Slice; - -// Credits: Skyrising -@Mixin(Blocks.class) -public class BlocksMixin -{ - @Shadow - private static Block register(String string_1, Block block_1) { - throw new AssertionError(); - } - - @Redirect(method = "", - slice = @Slice(from = @At(value = "CONSTANT", args = "stringValue=obsidian")), - at = @At(value = "INVOKE", - target = "Lnet/minecraft/block/Blocks;register(Ljava/lang/String;Lnet/minecraft/block/Block;)Lnet/minecraft/block/Block;", - ordinal = 0)) - private static Block registerObsidian(String id, Block obsidian) - { - return register(id, new ObsidianBlock(Block.Settings.copy(obsidian).ticksRandomly())); - } -} diff --git a/src/main/resources/carpet-extra.mixins.json b/src/main/resources/carpet-extra.mixins.json index 50602e4d..8808428b 100644 --- a/src/main/resources/carpet-extra.mixins.json +++ b/src/main/resources/carpet-extra.mixins.json @@ -52,7 +52,6 @@ "HopperBlock_syncMixin", "SaplingBlock_syncMixin", "SugarCaneBlock_syncMixin", - "BlocksMixin", "ChunkGeneratorMixin", "FallingBlockMixin", "ChickenEntityMixin",