cleanup unused code and mixins

This commit is contained in:
gnembon committed 2020-08-18 01:54:24 -03:00
1 parent 598219608b
commit 3167fe06f3
62 files changed
+56 -916

No files matched your search

@@ -293,7 +293,7 @@ public class BlockRotator
}
else if ((block instanceof ObserverBlock) || (block instanceof EndRodBlock))
{
newState = state.with(FacingBlock.FACING, (Direction) state.get(FacingBlock.FACING).getOpposite());
newState = state.with(FacingBlock.FACING, state.get(FacingBlock.FACING).getOpposite());
}
else if (block instanceof DispenserBlock)
{
@@ -313,7 +313,7 @@ public class BlockRotator
}
else if (block instanceof HopperBlock)
{
if ((Direction)state.get(HopperBlock.FACING) != Direction.DOWN)
if (state.get(HopperBlock.FACING) != Direction.DOWN)
{
newState = state.with(HopperBlock.FACING, state.get(HopperBlock.FACING).rotateYClockwise());
}
@@ -82,9 +82,6 @@ public class FeatureGenerator
StructureFeature<?> structureFeature = Registry.STRUCTURE_FEATURE.get(id);
if (structureFeature == null) return null;
return getDefaultFeature(structureFeature, world, pos, true);
// optionally fish out
}
synchronized public static Boolean plopGrid(ConfiguredStructureFeature<?, ?> structureFeature, ServerWorld world, BlockPos pos)
@@ -124,10 +121,6 @@ public class FeatureGenerator
{
return setupCustomStructure(structure, conf, biome, false);
}
private static Thing gridCustomStructure(StructureFeature structure, FeatureConfig conf, RegistryKey<Biome> biome)
{
return setupCustomStructure(structure, conf, biome, true);
}
private static Thing setupCustomStructure(StructureFeature structure, FeatureConfig conf, RegistryKey<Biome> biome, boolean wireOnly)
{
return (w, p) -> ((StructureFeatureInterface)structure).plopAnywhere(w, p, w.getChunkManager().getChunkGenerator(), wireOnly, w.getRegistryManager().get(Registry.BIOME_KEY).get(biome), conf);
@@ -149,7 +142,6 @@ public class FeatureGenerator
findFirst().map(Map.Entry::getValue).orElse(null);
}
public static <T extends FeatureConfig> StructureStart shouldStructureStartAt(ServerWorld world, BlockPos pos, StructureFeature<T> structure, boolean computeBox)
{
long seed = world.getSeed();
@@ -11,7 +11,6 @@ import net.minecraft.text.BaseText;
import net.minecraft.text.TranslatableText;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
import net.minecraft.world.dimension.DimensionType;
import java.util.ArrayList;
import java.util.Collections;
@@ -53,7 +53,6 @@ public class OptimizedExplosion
private static List<Entity> entitylist;
private static Vec3d vec3dmem;
private static long tickmem;
private static Vec3d vec3dZero = new Vec3d(0, 0, 0);
// For disabling the explosion particles and sound
public static int explosionSound = 0;
@@ -224,28 +223,6 @@ public class OptimizedExplosion
BlockState state = world.getBlockState(blockpos);
Block block = state.getBlock();
/*if (spawnParticles)
{
double d0 = (double)((float)blockpos.getX() + world.random.nextFloat());
double d1 = (double)((float)blockpos.getY() + world.random.nextFloat());
double d2 = (double)((float)blockpos.getZ() + world.random.nextFloat());
double d3 = d0 - posX;
double d4 = d1 - posY;
double d5 = d2 - posZ;
double d6 = (double)MathHelper.sqrt(d3 * d3 + d4 * d4 + d5 * d5);
d3 = d3 / d6;
d4 = d4 / d6;
d5 = d5 / d6;
double d7 = 0.5D / (d6 / (double) eAccess.getPower() + 0.1D);
d7 = d7 * (double)(world.random.nextFloat() * world.random.nextFloat() + 0.3F);
d3 = d3 * d7;
d4 = d4 * d7;
d5 = d5 * d7;
world.addParticle(ParticleTypes.POOF,
(d0 + posX) / 2.0D, (d1 + posY) / 2.0D, (d2 + posZ) / 2.0D, d3, d4, d5);
world.addParticle(ParticleTypes.SMOKE, d0, d1, d2, d3, d4, d5);
}*/
if (state.getMaterial() != Material.AIR)
{
if (block.shouldDropItemsOnExplosion(e) && world instanceof ServerWorld)
@@ -35,11 +35,6 @@ public class ParticleDisplay
return particleCache.get(name);
}
public static void drawParticleLine(ServerPlayerEntity player, Vec3d from, Vec3d to,String main)
{
drawParticleLine(player, from, to, main, null, 1, 0.0);
}
public static void drawParticleLine(ServerPlayerEntity player, Vec3d from, Vec3d to, String main, String accent, int count, double spread)
{
ParticleEffect accentParticle = getEffect(accent);