From 88337a3e0ce6f368624afeeb8960c97a71276ff0 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Fri, 22 May 2020 20:12:53 +0200 Subject: [PATCH] Renamed AllBlocksNew to AllBlocks --- .../{AllBlocksNew.java => AllBlocks.java} | 2 +- .../com/simibubi/create/AllTileEntities.java | 116 +++++++++--------- src/main/java/com/simibubi/create/Create.java | 2 +- .../com/simibubi/create/CreateItemGroup.java | 2 +- .../simibubi/create/compat/jei/CreateJEI.java | 24 ++-- .../jei/category/BlockCuttingCategory.java | 4 +- .../compat/jei/category/CrushingCategory.java | 4 +- .../category/MechanicalCraftingCategory.java | 4 +- .../compat/jei/category/MillingCategory.java | 4 +- .../compat/jei/category/MixingCategory.java | 4 +- .../compat/jei/category/PackingCategory.java | 4 +- .../compat/jei/category/PressingCategory.java | 4 +- .../category/ProcessingViaFanCategory.java | 4 +- .../compat/jei/category/SawingCategory.java | 4 +- .../category/animations/AnimatedCrafter.java | 4 +- .../animations/AnimatedCrushingWheels.java | 4 +- .../category/animations/AnimatedKinetics.java | 4 +- .../animations/AnimatedMillstone.java | 4 +- .../category/animations/AnimatedMixer.java | 6 +- .../category/animations/AnimatedPress.java | 6 +- .../jei/category/animations/AnimatedSaw.java | 4 +- .../create/data/CreateAdvancements.java | 56 ++++----- .../foundation/world/AllWorldFeatures.java | 10 +- .../contraptions/RotationPropagator.java | 6 +- .../base/KineticTileEntityRenderer.java | 4 +- .../contraptions/BlockMovementTraits.java | 12 +- .../components/contraptions/Contraption.java | 14 +-- .../contraptions/ContraptionCollider.java | 4 +- .../contraptions/StructureTransform.java | 4 +- .../chassis/ChassisTileEntity.java | 4 +- .../chassis/LinearChassisBlock.java | 4 +- .../mounted/CartAssemblerBlock.java | 4 +- .../mounted/MountedContraption.java | 10 +- .../piston/MechanicalPistonBlock.java | 12 +- .../piston/MechanicalPistonHeadBlock.java | 4 +- .../piston/MechanicalPistonTileEntity.java | 4 +- .../piston/PistonContraption.java | 4 +- .../contraptions/pulley/PulleyBlock.java | 4 +- .../contraptions/pulley/PulleyRenderer.java | 6 +- .../contraptions/pulley/PulleyTileEntity.java | 6 +- .../crafter/ConnectedInputHandler.java | 6 +- .../crafter/ConnectedInputRenderer.java | 4 +- .../crafter/MechanicalCrafterBlock.java | 4 +- .../crafter/MechanicalCrafterTileEntity.java | 6 +- .../components/crafter/RecipeGridHandler.java | 4 +- .../crusher/CrushingWheelBlock.java | 16 +-- .../crusher/CrushingWheelControllerBlock.java | 4 +- .../deployer/DeployerTileEntity.java | 4 +- .../components/fan/NozzleBlock.java | 4 +- .../flywheel/engine/EngineTileEntity.java | 4 +- .../flywheel/engine/FurnaceEngineBlock.java | 4 +- .../engine/FurnaceEngineTileEntity.java | 4 +- .../mixer/BasinOperatorBlockItem.java | 4 +- .../mixer/MechanicalMixerBlock.java | 4 +- .../press/MechanicalPressBlock.java | 6 +- .../components/saw/SawTileEntity.java | 6 +- .../turntable/TurntableHandler.java | 4 +- .../waterwheel/WaterWheelBlock.java | 6 +- .../waterwheel/WaterWheelTileEntity.java | 4 +- .../contraptions/processing/BasinBlock.java | 4 +- .../redstone/ContactMovementBehaviour.java | 6 +- .../redstone/RedstoneContactBlock.java | 4 +- .../sequencer/SequencedGearshiftScreen.java | 4 +- .../relays/belt/AllBeltAttachments.java | 10 +- .../contraptions/relays/belt/BeltBlock.java | 42 +++---- .../relays/belt/BeltTileEntity.java | 6 +- .../relays/belt/BeltTileEntityRenderer.java | 4 +- .../relays/belt/item/BeltConnectorItem.java | 6 +- .../relays/belt/transport/BeltInventory.java | 12 +- .../belt/transport/BeltMovementHandler.java | 6 +- .../relays/elementary/CogWheelBlock.java | 8 +- .../relays/elementary/CogwheelBlockItem.java | 4 +- .../relays/elementary/ShaftBlock.java | 4 +- .../relays/gearbox/VerticalGearboxItem.java | 4 +- .../block/AttachedLogisticalBlock.java | 4 +- .../block/RedstoneLinkTileEntity.java | 4 +- .../block/StockpileSwitchScreen.java | 4 +- .../belts/observer/BeltObserverBlock.java | 6 +- .../block/belts/tunnel/BeltTunnelBlock.java | 16 +-- .../belts/tunnel/BeltTunnelTileEntity.java | 6 +- .../block/diodes/AdjustableRepeaterBlock.java | 4 +- .../block/extractor/ExtractorBlock.java | 6 +- .../block/extractor/ExtractorTileEntity.java | 10 +- .../block/extractor/LinkedExtractorBlock.java | 6 +- .../logistics/block/funnel/FunnelBlock.java | 8 +- .../block/funnel/FunnelTileEntity.java | 4 +- .../inventories/AdjustableCrateBlock.java | 4 +- .../inventories/AdjustableCrateScreen.java | 6 +- .../AdjustableCrateTileEntity.java | 4 +- .../inventories/CreativeCrateTileEntity.java | 4 +- .../transposer/LinkedTransposerBlock.java | 6 +- .../block/transposer/TransposerBlock.java | 6 +- .../transposer/TransposerTileEntity.java | 4 +- .../schematics/ServerSchematicLoader.java | 4 +- .../schematics/block/LaunchedItem.java | 6 +- .../block/SchematicTableScreen.java | 4 +- .../block/SchematicannonScreen.java | 4 +- .../block/SchematicannonTileEntity.java | 10 +- 98 files changed, 374 insertions(+), 374 deletions(-) rename src/main/java/com/simibubi/create/{AllBlocksNew.java => AllBlocks.java} (99%) diff --git a/src/main/java/com/simibubi/create/AllBlocksNew.java b/src/main/java/com/simibubi/create/AllBlocks.java similarity index 99% rename from src/main/java/com/simibubi/create/AllBlocksNew.java rename to src/main/java/com/simibubi/create/AllBlocks.java index 944492d32..404210d61 100644 --- a/src/main/java/com/simibubi/create/AllBlocksNew.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -120,7 +120,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.common.ToolType; -public class AllBlocksNew { +public class AllBlocks { private static final CreateRegistrate REGISTRATE = Create.registrate() .itemGroup(() -> Create.baseCreativeTab); diff --git a/src/main/java/com/simibubi/create/AllTileEntities.java b/src/main/java/com/simibubi/create/AllTileEntities.java index efc41b5a3..4810fdac6 100644 --- a/src/main/java/com/simibubi/create/AllTileEntities.java +++ b/src/main/java/com/simibubi/create/AllTileEntities.java @@ -104,70 +104,70 @@ import net.minecraftforge.fml.client.registry.ClientRegistry; public enum AllTileEntities { // Schematics - SCHEMATICANNON(SchematicannonTileEntity::new, AllBlocksNew.SCHEMATICANNON), - SCHEMATIC_TABLE(SchematicTableTileEntity::new, AllBlocksNew.SCHEMATIC_TABLE), + SCHEMATICANNON(SchematicannonTileEntity::new, AllBlocks.SCHEMATICANNON), + SCHEMATIC_TABLE(SchematicTableTileEntity::new, AllBlocks.SCHEMATIC_TABLE), // Kinetics - SIMPLE_KINETIC(SimpleKineticTileEntity::new, AllBlocksNew.SHAFT, AllBlocksNew.COGWHEEL, AllBlocksNew.LARGE_COGWHEEL, - AllBlocksNew.ENCASED_SHAFT), - MOTOR(MotorTileEntity::new, AllBlocksNew.CREATIVE_MOTOR), - GEARBOX(GearboxTileEntity::new, AllBlocksNew.GEARBOX), - ENCASED_SHAFT(EncasedShaftTileEntity::new, AllBlocksNew.ENCASED_SHAFT, AllBlocksNew.ENCASED_BELT), - ADJUSTABLE_PULLEY(AdjustablePulleyTileEntity::new, AllBlocksNew.ADJUSTABLE_PULLEY), - ENCASED_FAN(EncasedFanTileEntity::new, AllBlocksNew.ENCASED_FAN), - NOZZLE(NozzleTileEntity::new, AllBlocksNew.NOZZLE), - CLUTCH(ClutchTileEntity::new, AllBlocksNew.CLUTCH), - GEARSHIFT(GearshiftTileEntity::new, AllBlocksNew.GEARSHIFT), - TURNTABLE(TurntableTileEntity::new, AllBlocksNew.TURNTABLE), - HAND_CRANK(HandCrankTileEntity::new, AllBlocksNew.HAND_CRANK), - CUCKOO_CLOCK(CuckooClockTileEntity::new, AllBlocksNew.CUCKOO_CLOCK, AllBlocksNew.MYSTERIOUS_CUCKOO_CLOCK), + SIMPLE_KINETIC(SimpleKineticTileEntity::new, AllBlocks.SHAFT, AllBlocks.COGWHEEL, AllBlocks.LARGE_COGWHEEL, + AllBlocks.ENCASED_SHAFT), + MOTOR(MotorTileEntity::new, AllBlocks.CREATIVE_MOTOR), + GEARBOX(GearboxTileEntity::new, AllBlocks.GEARBOX), + ENCASED_SHAFT(EncasedShaftTileEntity::new, AllBlocks.ENCASED_SHAFT, AllBlocks.ENCASED_BELT), + ADJUSTABLE_PULLEY(AdjustablePulleyTileEntity::new, AllBlocks.ADJUSTABLE_PULLEY), + ENCASED_FAN(EncasedFanTileEntity::new, AllBlocks.ENCASED_FAN), + NOZZLE(NozzleTileEntity::new, AllBlocks.NOZZLE), + CLUTCH(ClutchTileEntity::new, AllBlocks.CLUTCH), + GEARSHIFT(GearshiftTileEntity::new, AllBlocks.GEARSHIFT), + TURNTABLE(TurntableTileEntity::new, AllBlocks.TURNTABLE), + HAND_CRANK(HandCrankTileEntity::new, AllBlocks.HAND_CRANK), + CUCKOO_CLOCK(CuckooClockTileEntity::new, AllBlocks.CUCKOO_CLOCK, AllBlocks.MYSTERIOUS_CUCKOO_CLOCK), - BELT(BeltTileEntity::new, AllBlocksNew.BELT), - BELT_TUNNEL(BeltTunnelTileEntity::new, AllBlocksNew.BELT_TUNNEL), - MECHANICAL_PISTON(MechanicalPistonTileEntity::new, AllBlocksNew.MECHANICAL_PISTON, - AllBlocksNew.STICKY_MECHANICAL_PISTON), - MECHANICAL_BEARING(MechanicalBearingTileEntity::new, AllBlocksNew.MECHANICAL_BEARING), - CLOCKWORK_BEARING(ClockworkBearingTileEntity::new, AllBlocksNew.CLOCKWORK_BEARING), - ROPE_PULLEY(PulleyTileEntity::new, AllBlocksNew.ROPE_PULLEY), - CHASSIS(ChassisTileEntity::new, AllBlocksNew.RADIAL_CHASSIS, AllBlocksNew.LINEAR_CHASSIS, - AllBlocksNew.LINEAR_CHASSIS_SECONDARY), - DRILL(DrillTileEntity::new, AllBlocksNew.DRILL), - SAW(SawTileEntity::new, AllBlocksNew.SAW), - HARVESTER(HarvesterTileEntity::new, AllBlocksNew.HARVESTER), - FLYWHEEL(FlywheelTileEntity::new, AllBlocksNew.FLYWHEEL), - FURNACE_ENGINE(FurnaceEngineTileEntity::new, AllBlocksNew.FURNACE_ENGINE), + BELT(BeltTileEntity::new, AllBlocks.BELT), + BELT_TUNNEL(BeltTunnelTileEntity::new, AllBlocks.BELT_TUNNEL), + MECHANICAL_PISTON(MechanicalPistonTileEntity::new, AllBlocks.MECHANICAL_PISTON, + AllBlocks.STICKY_MECHANICAL_PISTON), + MECHANICAL_BEARING(MechanicalBearingTileEntity::new, AllBlocks.MECHANICAL_BEARING), + CLOCKWORK_BEARING(ClockworkBearingTileEntity::new, AllBlocks.CLOCKWORK_BEARING), + ROPE_PULLEY(PulleyTileEntity::new, AllBlocks.ROPE_PULLEY), + CHASSIS(ChassisTileEntity::new, AllBlocks.RADIAL_CHASSIS, AllBlocks.LINEAR_CHASSIS, + AllBlocks.LINEAR_CHASSIS_SECONDARY), + DRILL(DrillTileEntity::new, AllBlocks.DRILL), + SAW(SawTileEntity::new, AllBlocks.SAW), + HARVESTER(HarvesterTileEntity::new, AllBlocks.HARVESTER), + FLYWHEEL(FlywheelTileEntity::new, AllBlocks.FLYWHEEL), + FURNACE_ENGINE(FurnaceEngineTileEntity::new, AllBlocks.FURNACE_ENGINE), - MILLSTONE(MillstoneTileEntity::new, AllBlocksNew.MILLSTONE), - CRUSHING_WHEEL(CrushingWheelTileEntity::new, AllBlocksNew.CRUSHING_WHEEL), - CRUSHING_WHEEL_CONTROLLER(CrushingWheelControllerTileEntity::new, AllBlocksNew.CRUSHING_WHEEL_CONTROLLER), - WATER_WHEEL(WaterWheelTileEntity::new, AllBlocksNew.WATER_WHEEL), - MECHANICAL_PRESS(MechanicalPressTileEntity::new, AllBlocksNew.MECHANICAL_PRESS), - MECHANICAL_MIXER(MechanicalMixerTileEntity::new, AllBlocksNew.MECHANICAL_MIXER), - DEPLOYER(DeployerTileEntity::new, AllBlocksNew.DEPLOYER), - BASIN(BasinTileEntity::new, AllBlocksNew.BASIN), - MECHANICAL_CRAFTER(MechanicalCrafterTileEntity::new, AllBlocksNew.MECHANICAL_CRAFTER), - SEQUENCED_GEARSHIFT(SequencedGearshiftTileEntity::new, AllBlocksNew.SEQUENCED_GEARSHIFT), - ROTATION_SPEED_CONTROLLER(SpeedControllerTileEntity::new, AllBlocksNew.ROTATION_SPEED_CONTROLLER), - SPEEDOMETER(SpeedGaugeTileEntity::new, AllBlocksNew.SPEEDOMETER), - STRESSOMETER(StressGaugeTileEntity::new, AllBlocksNew.STRESSOMETER), - ANALOG_LEVER(AnalogLeverTileEntity::new, AllBlocksNew.ANALOG_LEVER), - CART_ASSEMBLER(CartAssemblerTileEntity::new, AllBlocksNew.CART_ASSEMBLER), + MILLSTONE(MillstoneTileEntity::new, AllBlocks.MILLSTONE), + CRUSHING_WHEEL(CrushingWheelTileEntity::new, AllBlocks.CRUSHING_WHEEL), + CRUSHING_WHEEL_CONTROLLER(CrushingWheelControllerTileEntity::new, AllBlocks.CRUSHING_WHEEL_CONTROLLER), + WATER_WHEEL(WaterWheelTileEntity::new, AllBlocks.WATER_WHEEL), + MECHANICAL_PRESS(MechanicalPressTileEntity::new, AllBlocks.MECHANICAL_PRESS), + MECHANICAL_MIXER(MechanicalMixerTileEntity::new, AllBlocks.MECHANICAL_MIXER), + DEPLOYER(DeployerTileEntity::new, AllBlocks.DEPLOYER), + BASIN(BasinTileEntity::new, AllBlocks.BASIN), + MECHANICAL_CRAFTER(MechanicalCrafterTileEntity::new, AllBlocks.MECHANICAL_CRAFTER), + SEQUENCED_GEARSHIFT(SequencedGearshiftTileEntity::new, AllBlocks.SEQUENCED_GEARSHIFT), + ROTATION_SPEED_CONTROLLER(SpeedControllerTileEntity::new, AllBlocks.ROTATION_SPEED_CONTROLLER), + SPEEDOMETER(SpeedGaugeTileEntity::new, AllBlocks.SPEEDOMETER), + STRESSOMETER(StressGaugeTileEntity::new, AllBlocks.STRESSOMETER), + ANALOG_LEVER(AnalogLeverTileEntity::new, AllBlocks.ANALOG_LEVER), + CART_ASSEMBLER(CartAssemblerTileEntity::new, AllBlocks.CART_ASSEMBLER), // Logistics - REDSTONE_LINK(RedstoneLinkTileEntity::new, AllBlocksNew.REDSTONE_LINK), - STOCKPILE_SWITCH(StockpileSwitchTileEntity::new, AllBlocksNew.STOCKPILE_SWITCH), - ADJUSTABLE_CRATE(AdjustableCrateTileEntity::new, AllBlocksNew.ADJUSTABLE_CRATE), - CREATIVE_CRATE(CreativeCrateTileEntity::new, AllBlocksNew.CREATIVE_CRATE), - EXTRACTOR(ExtractorTileEntity::new, AllBlocksNew.EXTRACTOR, AllBlocksNew.VERTICAL_EXTRACTOR), - LINKED_EXTRACTOR(LinkedExtractorTileEntity::new, AllBlocksNew.LINKED_EXTRACTOR, - AllBlocksNew.VERTICAL_LINKED_EXTRACTOR), - TRANSPOSER(TransposerTileEntity::new, AllBlocksNew.TRANSPOSER, AllBlocksNew.VERTICAL_TRANSPOSER), - LINKED_TRANSPOSER(LinkedTransposerTileEntity::new, AllBlocksNew.LINKED_TRANSPOSER, - AllBlocksNew.VERTICAL_LINKED_TRANSPOSER), - FUNNEL(FunnelTileEntity::new, AllBlocksNew.FUNNEL, AllBlocksNew.VERTICAL_FUNNEL), - BELT_OBSERVER(BeltObserverTileEntity::new, AllBlocksNew.BELT_OBSERVER), - ADJUSTABLE_REPEATER(AdjustableRepeaterTileEntity::new, AllBlocksNew.ADJUSTABLE_REPEATER), - ADJUSTABLE_PULSE_REPEATER(AdjustablePulseRepeaterTileEntity::new, AllBlocksNew.ADJUSTABLE_PULSE_REPEATER), + REDSTONE_LINK(RedstoneLinkTileEntity::new, AllBlocks.REDSTONE_LINK), + STOCKPILE_SWITCH(StockpileSwitchTileEntity::new, AllBlocks.STOCKPILE_SWITCH), + ADJUSTABLE_CRATE(AdjustableCrateTileEntity::new, AllBlocks.ADJUSTABLE_CRATE), + CREATIVE_CRATE(CreativeCrateTileEntity::new, AllBlocks.CREATIVE_CRATE), + EXTRACTOR(ExtractorTileEntity::new, AllBlocks.EXTRACTOR, AllBlocks.VERTICAL_EXTRACTOR), + LINKED_EXTRACTOR(LinkedExtractorTileEntity::new, AllBlocks.LINKED_EXTRACTOR, + AllBlocks.VERTICAL_LINKED_EXTRACTOR), + TRANSPOSER(TransposerTileEntity::new, AllBlocks.TRANSPOSER, AllBlocks.VERTICAL_TRANSPOSER), + LINKED_TRANSPOSER(LinkedTransposerTileEntity::new, AllBlocks.LINKED_TRANSPOSER, + AllBlocks.VERTICAL_LINKED_TRANSPOSER), + FUNNEL(FunnelTileEntity::new, AllBlocks.FUNNEL, AllBlocks.VERTICAL_FUNNEL), + BELT_OBSERVER(BeltObserverTileEntity::new, AllBlocks.BELT_OBSERVER), + ADJUSTABLE_REPEATER(AdjustableRepeaterTileEntity::new, AllBlocks.ADJUSTABLE_REPEATER), + ADJUSTABLE_PULSE_REPEATER(AdjustablePulseRepeaterTileEntity::new, AllBlocks.ADJUSTABLE_PULSE_REPEATER), ; diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index 7831b1279..a6ddd098b 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -56,7 +56,7 @@ public class Create { MinecraftForge.EVENT_BUS.addListener(Create::serverStarting); - AllBlocksNew.register(); + AllBlocks.register(); AllPaletteBlocks.register(); // modEventBus.addGenericListener(Block.class, AllBlocks::register); modEventBus.addGenericListener(Item.class, AllItems::register); diff --git a/src/main/java/com/simibubi/create/CreateItemGroup.java b/src/main/java/com/simibubi/create/CreateItemGroup.java index fa02f7267..8aad1d18e 100644 --- a/src/main/java/com/simibubi/create/CreateItemGroup.java +++ b/src/main/java/com/simibubi/create/CreateItemGroup.java @@ -19,7 +19,7 @@ public class CreateItemGroup extends CreateItemGroupBase { @Override public ItemStack createIcon() { - return AllBlocksNew.COGWHEEL.asStack(); + return AllBlocks.COGWHEEL.asStack(); } } diff --git a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java index 75c9f6707..31e2451e5 100644 --- a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java +++ b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.stream.Collectors; import com.google.common.base.Predicate; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.AllRecipes; import com.simibubi.create.Create; @@ -139,7 +139,7 @@ public class CreateJEI implements IModPlugin { @Override public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) { - ItemStack fan = new ItemStack(AllBlocksNew.ENCASED_FAN.get()); + ItemStack fan = new ItemStack(AllBlocks.ENCASED_FAN.get()); ItemStack splashingFan = fan .copy() @@ -153,24 +153,24 @@ public class CreateJEI implements IModPlugin { .setDisplayName( new StringTextComponent(TextFormatting.RESET + Lang.translate("recipe.blastingViaFan.fan"))); - registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.MILLSTONE.get()), millingCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.CRUSHING_WHEEL.get()), crushingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocks.MILLSTONE.get()), millingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocks.CRUSHING_WHEEL.get()), crushingCategory.getUid()); registration.addRecipeCatalyst(splashingFan, splashingCategory.getUid()); registration.addRecipeCatalyst(smokingFan, smokingCategory.getUid()); registration.addRecipeCatalyst(blastingFan, blastingCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.MECHANICAL_PRESS.get()), pressingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocks.MECHANICAL_PRESS.get()), pressingCategory.getUid()); registration.addRecipeCatalyst(new ItemStack(AllItems.PLACEMENT_HANDGUN.get()), blockzapperCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.MECHANICAL_MIXER.get()), mixingCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.BASIN.get()), mixingCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.SAW.get()), sawingCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.SAW.get()), blockCuttingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocks.MECHANICAL_MIXER.get()), mixingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocks.BASIN.get()), mixingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocks.SAW.get()), sawingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocks.SAW.get()), blockCuttingCategory.getUid()); registration.addRecipeCatalyst(new ItemStack(Blocks.STONECUTTER), blockCuttingCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.MECHANICAL_PRESS.get()), packingCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllBlocksNew.BASIN.get()), packingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocks.MECHANICAL_PRESS.get()), packingCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllBlocks.BASIN.get()), packingCategory.getUid()); registration.addRecipeCatalyst(AllItems.SAND_PAPER.asStack(), polishingCategory.getUid()); registration.addRecipeCatalyst(AllItems.RED_SAND_PAPER.asStack(), polishingCategory.getUid()); registration - .addRecipeCatalyst(new ItemStack(AllBlocksNew.MECHANICAL_CRAFTER.get()), + .addRecipeCatalyst(new ItemStack(AllBlocks.MECHANICAL_CRAFTER.get()), mechanicalCraftingCategory.getUid()); } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/BlockCuttingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/BlockCuttingCategory.java index 1be044a51..b11f30e91 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/BlockCuttingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/BlockCuttingCategory.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.ScreenResources; import com.simibubi.create.compat.jei.category.BlockCuttingCategory.CondensedBlockCuttingRecipe; import com.simibubi.create.compat.jei.category.animations.AnimatedSaw; @@ -26,7 +26,7 @@ public class BlockCuttingCategory extends CreateRecipeCategory { private AnimatedMixer mixer = new AnimatedMixer(); public MixingCategory() { - super("mixing", doubleItemIcon(AllBlocksNew.MECHANICAL_MIXER.get(), AllBlocksNew.BASIN.get()), + super("mixing", doubleItemIcon(AllBlocks.MECHANICAL_MIXER.get(), AllBlocks.BASIN.get()), emptyBackground(177, 70)); } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java index 22f22b973..b2a91f637 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/PackingCategory.java @@ -2,7 +2,7 @@ package com.simibubi.create.compat.jei.category; import java.util.Arrays; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.ScreenResources; import com.simibubi.create.compat.jei.category.animations.AnimatedPress; @@ -20,7 +20,7 @@ public class PackingCategory extends CreateRecipeCategory> { private AnimatedPress press = new AnimatedPress(true); public PackingCategory() { - super("packing", doubleItemIcon(AllBlocksNew.MECHANICAL_PRESS.get(), AllBlocksNew.BASIN.get()), + super("packing", doubleItemIcon(AllBlocks.MECHANICAL_PRESS.get(), AllBlocks.BASIN.get()), emptyBackground(177, 70)); } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java index 4ed22fe8b..e01e749b4 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/PressingCategory.java @@ -3,7 +3,7 @@ package com.simibubi.create.compat.jei.category; import java.util.Arrays; import java.util.List; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.ScreenResources; import com.simibubi.create.compat.jei.category.animations.AnimatedPress; @@ -20,7 +20,7 @@ public class PressingCategory extends CreateRecipeCategory { private AnimatedPress press = new AnimatedPress(false); public PressingCategory() { - super("pressing", doubleItemIcon(AllBlocksNew.MECHANICAL_PRESS.get(), AllItems.IRON_SHEET.get()), + super("pressing", doubleItemIcon(AllBlocks.MECHANICAL_PRESS.get(), AllItems.IRON_SHEET.get()), emptyBackground(177, 70)); } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java index 964c0168e..85c3f88e0 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/ProcessingViaFanCategory.java @@ -4,7 +4,7 @@ import java.util.Arrays; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.ScreenResources; import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics; import com.simibubi.create.foundation.gui.GuiGameElement; @@ -62,7 +62,7 @@ public abstract class ProcessingViaFanCategory> extends Cre .scale(scale) .render(); - GuiGameElement.of(AllBlocksNew.ENCASED_FAN.getDefaultState()) + GuiGameElement.of(AllBlocks.ENCASED_FAN.getDefaultState()) .rotateBlock(0, 180, 0) .atLocal(0, 0, 0) .scale(scale) diff --git a/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java index 82ca90d2f..c41b2d9ee 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/SawingCategory.java @@ -3,7 +3,7 @@ package com.simibubi.create.compat.jei.category; import java.util.Arrays; import java.util.List; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.ScreenResources; import com.simibubi.create.compat.jei.category.animations.AnimatedSaw; import com.simibubi.create.modules.contraptions.components.saw.CuttingRecipe; @@ -20,7 +20,7 @@ public class SawingCategory extends CreateRecipeCategory { private AnimatedSaw saw = new AnimatedSaw(); public SawingCategory() { - super("sawing", doubleItemIcon(AllBlocksNew.SAW.get(), Items.OAK_LOG), emptyBackground(177, 70)); + super("sawing", doubleItemIcon(AllBlocks.SAW.get(), Items.OAK_LOG), emptyBackground(177, 70)); } @Override diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java index 57a3dc3af..908f9d421 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrafter.java @@ -1,7 +1,7 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.GuiGameElement; @@ -23,7 +23,7 @@ public class AnimatedCrafter extends AnimatedKinetics { .scale(scale) .render(); - GuiGameElement.of(AllBlocksNew.MECHANICAL_CRAFTER.getDefaultState()) + GuiGameElement.of(AllBlocks.MECHANICAL_CRAFTER.getDefaultState()) .rotateBlock(0, 180, 0) .scale(scale) .render(); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrushingWheels.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrushingWheels.java index 068df3392..1ae4cf281 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrushingWheels.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedCrushingWheels.java @@ -1,7 +1,7 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.gui.GuiGameElement; import net.minecraft.block.BlockState; @@ -17,7 +17,7 @@ public class AnimatedCrushingWheels extends AnimatedKinetics { RenderSystem.rotatef(-22.5f, 0, 1, 0); int scale = 22; - BlockState wheel = AllBlocksNew.CRUSHING_WHEEL.get() + BlockState wheel = AllBlocks.CRUSHING_WHEEL.get() .getDefaultState() .with(BlockStateProperties.AXIS, Axis.X); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedKinetics.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedKinetics.java index 13d5e322d..33fe15a29 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedKinetics.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedKinetics.java @@ -1,7 +1,7 @@ package com.simibubi.create.compat.jei.category.animations; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.AnimationTickHolder; import mezz.jei.api.gui.drawable.IDrawable; @@ -17,7 +17,7 @@ public abstract class AnimatedKinetics implements IDrawable { } protected BlockState shaft(Axis axis) { - return AllBlocksNew.SHAFT.getDefaultState().with(BlockStateProperties.AXIS, axis); + return AllBlocks.SHAFT.getDefaultState().with(BlockStateProperties.AXIS, axis); } protected AllBlockPartials cogwheel() { diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java index 795db9fd6..e0c69ed36 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMillstone.java @@ -2,7 +2,7 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.GuiGameElement; @@ -21,7 +21,7 @@ public class AnimatedMillstone extends AnimatedKinetics { .scale(scale) .render(); - GuiGameElement.of(AllBlocksNew.MILLSTONE.getDefaultState()) + GuiGameElement.of(AllBlocks.MILLSTONE.getDefaultState()) .rotateBlock(22.5, 22.5, 0) .scale(scale) .render(); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java index f25bdb2b0..5cf2ad598 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedMixer.java @@ -2,7 +2,7 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.gui.GuiGameElement; public class AnimatedMixer extends AnimatedKinetics { @@ -21,7 +21,7 @@ public class AnimatedMixer extends AnimatedKinetics { .scale(scale) .render(); - GuiGameElement.of(AllBlocksNew.MECHANICAL_MIXER.getDefaultState()) + GuiGameElement.of(AllBlocks.MECHANICAL_MIXER.getDefaultState()) .atLocal(0, 0, 0) .scale(scale) .render(); @@ -37,7 +37,7 @@ public class AnimatedMixer extends AnimatedKinetics { .scale(scale) .render(); - GuiGameElement.of(AllBlocksNew.BASIN.getDefaultState()) + GuiGameElement.of(AllBlocks.BASIN.getDefaultState()) .atLocal(0, 1.65, 0) .scale(scale) .render(); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java index 924aa13e3..4bafd18ed 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedPress.java @@ -4,7 +4,7 @@ import static com.simibubi.create.foundation.utility.AnimationTickHolder.ticks; import com.mojang.blaze3d.systems.RenderSystem; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.gui.GuiGameElement; import net.minecraft.client.Minecraft; @@ -31,7 +31,7 @@ public class AnimatedPress extends AnimatedKinetics { .scale(scale) .render(); - GuiGameElement.of(AllBlocksNew.MECHANICAL_PRESS.getDefaultState()) + GuiGameElement.of(AllBlocks.MECHANICAL_PRESS.getDefaultState()) .scale(scale) .render(); @@ -41,7 +41,7 @@ public class AnimatedPress extends AnimatedKinetics { .render(); if (basin) - GuiGameElement.of(AllBlocksNew.BASIN.getDefaultState()) + GuiGameElement.of(AllBlocks.BASIN.getDefaultState()) .atLocal(0, 1.65, 0) .scale(scale) .render(); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java index f9af8e143..895d8d9fe 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/animations/AnimatedSaw.java @@ -1,7 +1,7 @@ package com.simibubi.create.compat.jei.category.animations; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.GuiGameElement; import com.simibubi.create.modules.contraptions.components.saw.SawBlock; @@ -28,7 +28,7 @@ public class AnimatedSaw extends AnimatedKinetics { .scale(scale) .render(); - GuiGameElement.of(AllBlocksNew.SAW.getDefaultState() + GuiGameElement.of(AllBlocks.SAW.getDefaultState() .with(SawBlock.FACING, Direction.UP) .with(SawBlock.RUNNING, true)) .rotateBlock(0, 0, 0) diff --git a/src/main/java/com/simibubi/create/data/CreateAdvancements.java b/src/main/java/com/simibubi/create/data/CreateAdvancements.java index 295d555a1..88e24615f 100644 --- a/src/main/java/com/simibubi/create/data/CreateAdvancements.java +++ b/src/main/java/com/simibubi/create/data/CreateAdvancements.java @@ -11,7 +11,7 @@ import org.apache.logging.log4j.Logger; import com.google.common.collect.Sets; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.Create; import com.simibubi.create.foundation.advancement.AllTriggers; @@ -60,8 +60,8 @@ public class CreateAdvancements implements IDataProvider { kineticsBranch(t, andesite_alloy); Advancement water_wheel = - advancement("water_wheel", AllBlocksNew.WATER_WHEEL.get(), TaskType.NORMAL).withParent(andesite_alloy) - .withCriterion("0", placeBlock(AllBlocksNew.WATER_WHEEL.get())) + advancement("water_wheel", AllBlocks.WATER_WHEEL.get(), TaskType.NORMAL).withParent(andesite_alloy) + .withCriterion("0", placeBlock(AllBlocks.WATER_WHEEL.get())) .withCriterion("1", AllTriggers.WATER_WHEEL.instance()) .register(t, id + ":water_wheel"); @@ -70,22 +70,22 @@ public class CreateAdvancements implements IDataProvider { .register(t, id + ":lava_wheel"); Advancement millstone = - kinecticAdvancement("millstone", AllBlocksNew.MILLSTONE.get(), TaskType.NORMAL).withParent(andesite_alloy) + kinecticAdvancement("millstone", AllBlocks.MILLSTONE.get(), TaskType.NORMAL).withParent(andesite_alloy) .register(t, id + ":millstone"); Advancement andesite_casing = - advancement("andesite_casing", AllBlocksNew.ANDESITE_CASING.get(), TaskType.GOAL).withParent(andesite_alloy) - .withCriterion("0", itemGathered(AllBlocksNew.ANDESITE_CASING.get())) + advancement("andesite_casing", AllBlocks.ANDESITE_CASING.get(), TaskType.GOAL).withParent(andesite_alloy) + .withCriterion("0", itemGathered(AllBlocks.ANDESITE_CASING.get())) .register(t, id + ":andesite_casing"); andesiteExpertLane(t, andesite_casing); Advancement drill = - kinecticAdvancement("drill", AllBlocksNew.DRILL.get(), TaskType.NORMAL).withParent(andesite_casing) + kinecticAdvancement("drill", AllBlocks.DRILL.get(), TaskType.NORMAL).withParent(andesite_casing) .register(t, id + ":drill"); Advancement press = - advancement("press", AllBlocksNew.MECHANICAL_PRESS.get(), TaskType.MILESTONE).withParent(andesite_casing) + advancement("press", AllBlocks.MECHANICAL_PRESS.get(), TaskType.MILESTONE).withParent(andesite_casing) .withCriterion("0", AllTriggers.BONK.instance()) .register(t, id + ":press"); @@ -98,17 +98,17 @@ public class CreateAdvancements implements IDataProvider { itemAdvancement("electron_tube", AllItems.ELECTRON_TUBE, TaskType.NORMAL).withParent(rose_quartz) .register(t, id + ":electron_tube"); - Advancement saw = kinecticAdvancement("saw", AllBlocksNew.SAW.get(), TaskType.NORMAL).withParent(press) + Advancement saw = kinecticAdvancement("saw", AllBlocks.SAW.get(), TaskType.NORMAL).withParent(press) .register(t, id + ":saw"); - Advancement basin = advancement("basin", AllBlocksNew.BASIN.get(), TaskType.NORMAL).withParent(press) - .withCriterion("0", placeBlock(AllBlocksNew.BASIN.get())) + Advancement basin = advancement("basin", AllBlocks.BASIN.get(), TaskType.NORMAL).withParent(press) + .withCriterion("0", placeBlock(AllBlocks.BASIN.get())) .withCriterion("1", AllTriggers.BASIN_THROW.instance()) .register(t, id + ":basin"); - Advancement mixer = advancement("mixer", AllBlocksNew.MECHANICAL_MIXER.get(), TaskType.MILESTONE) - .withCriterion("0", placeBlock(AllBlocksNew.MECHANICAL_MIXER.get())) - .withCriterion("1", isPowered(AllBlocksNew.MECHANICAL_MIXER.get())) + Advancement mixer = advancement("mixer", AllBlocks.MECHANICAL_MIXER.get(), TaskType.MILESTONE) + .withCriterion("0", placeBlock(AllBlocks.MECHANICAL_MIXER.get())) + .withCriterion("1", isPowered(AllBlocks.MECHANICAL_MIXER.get())) .withCriterion("2", AllTriggers.MIXER_MIX.instance()) .withParent(basin) .register(t, id + ":mixer"); @@ -128,7 +128,7 @@ public class CreateAdvancements implements IDataProvider { void kineticsBranch(Consumer t, Advancement root) { String id = Create.ID; - Advancement its_alive = advancement("its_alive", AllBlocksNew.COGWHEEL.get(), TaskType.NORMAL).withParent(root) + Advancement its_alive = advancement("its_alive", AllBlocks.COGWHEEL.get(), TaskType.NORMAL).withParent(root) .withCriterion("0", AllTriggers.ROTATION.instance()) .register(t, id + ":its_alive"); @@ -143,15 +143,15 @@ public class CreateAdvancements implements IDataProvider { .register(t, id + ":goggles"); Advancement speed_gauge = - kinecticAdvancement("speed_gauge", AllBlocksNew.SPEEDOMETER.get(), TaskType.NORMAL).withParent(goggles) + kinecticAdvancement("speed_gauge", AllBlocks.SPEEDOMETER.get(), TaskType.NORMAL).withParent(goggles) .register(t, id + ":speed_gauge"); Advancement stress_gauge = - kinecticAdvancement("stress_gauge", AllBlocksNew.STRESSOMETER.get(), TaskType.NORMAL).withParent(goggles) + kinecticAdvancement("stress_gauge", AllBlocks.STRESSOMETER.get(), TaskType.NORMAL).withParent(goggles) .register(t, id + ":stress_gauge"); Advancement shifting_gears = - advancement("shifting_gears", AllBlocksNew.LARGE_COGWHEEL.get(), TaskType.NORMAL).withParent(its_alive) + advancement("shifting_gears", AllBlocks.LARGE_COGWHEEL.get(), TaskType.NORMAL).withParent(its_alive) .withCriterion("0", AllTriggers.SHIFTING_GEARS.instance()) .register(t, id + ":shifting_gears"); @@ -165,12 +165,12 @@ public class CreateAdvancements implements IDataProvider { String id = Create.ID; Advancement copper_casing = - advancement("copper_casing", AllBlocksNew.COPPER_CASING.get(), TaskType.GOAL).withParent(root) - .withCriterion("0", itemGathered(AllBlocksNew.COPPER_CASING.get())) + advancement("copper_casing", AllBlocks.COPPER_CASING.get(), TaskType.GOAL).withParent(root) + .withCriterion("0", itemGathered(AllBlocks.COPPER_CASING.get())) .register(t, id + ":copper_casing"); Advancement copper_end = deadEnd().withParent(copper_casing) - .withCriterion("0", itemGathered(AllBlocksNew.COPPER_CASING.get())) + .withCriterion("0", itemGathered(AllBlocks.COPPER_CASING.get())) .register(t, id + ":copper_end"); } @@ -178,25 +178,25 @@ public class CreateAdvancements implements IDataProvider { String id = Create.ID; Advancement brass_casing = - advancement("brass_casing", AllBlocksNew.BRASS_CASING.get(), TaskType.GOAL).withParent(root) - .withCriterion("0", itemGathered(AllBlocksNew.BRASS_CASING.get())) + advancement("brass_casing", AllBlocks.BRASS_CASING.get(), TaskType.GOAL).withParent(root) + .withCriterion("0", itemGathered(AllBlocks.BRASS_CASING.get())) .register(t, id + ":brass_casing"); - Advancement crafter = kinecticAdvancement("crafter", AllBlocksNew.MECHANICAL_CRAFTER.get(), TaskType.MILESTONE) + Advancement crafter = kinecticAdvancement("crafter", AllBlocks.MECHANICAL_CRAFTER.get(), TaskType.MILESTONE) .withParent(brass_casing) .register(t, id + ":crafter"); Advancement deployer = - kinecticAdvancement("deployer", AllBlocksNew.DEPLOYER.get(), TaskType.GOAL).withParent(brass_casing) + kinecticAdvancement("deployer", AllBlocks.DEPLOYER.get(), TaskType.GOAL).withParent(brass_casing) .register(t, id + ":deployer"); - Advancement fist_bump = advancement("fist_bump", AllBlocksNew.DEPLOYER.get(), TaskType.SECRET).withParent(deployer) + Advancement fist_bump = advancement("fist_bump", AllBlocks.DEPLOYER.get(), TaskType.SECRET).withParent(deployer) .withCriterion("0", AllTriggers.DEPLOYER_BOOP.instance()) .register(t, id + ":fist_bump"); Advancement crushing_wheel = - advancement("crushing_wheel", AllBlocksNew.CRUSHING_WHEEL.get(), TaskType.MILESTONE).withParent(crafter) - .withCriterion("0", itemGathered(AllBlocksNew.CRUSHING_WHEEL.get())) + advancement("crushing_wheel", AllBlocks.CRUSHING_WHEEL.get(), TaskType.MILESTONE).withParent(crafter) + .withCriterion("0", itemGathered(AllBlocks.CRUSHING_WHEEL.get())) .register(t, id + ":crushing_wheel"); Advancement chromatic_compound = diff --git a/src/main/java/com/simibubi/create/foundation/world/AllWorldFeatures.java b/src/main/java/com/simibubi/create/foundation/world/AllWorldFeatures.java index c29376532..ed9a4e833 100644 --- a/src/main/java/com/simibubi/create/foundation/world/AllWorldFeatures.java +++ b/src/main/java/com/simibubi/create/foundation/world/AllWorldFeatures.java @@ -8,7 +8,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.modules.palettes.AllPaletteBlocks; @@ -20,11 +20,11 @@ import net.minecraftforge.registries.ForgeRegistries; public enum AllWorldFeatures { - COPPER_ORE(new CountedOreFeature(AllBlocksNew.COPPER_ORE, 18, 2).between(40, 86)), - COPPER_ORE_OCEAN(new CountedOreFeature(AllBlocksNew.COPPER_ORE, 15, 4).between(20, 55).inBiomes(OCEAN)), + COPPER_ORE(new CountedOreFeature(AllBlocks.COPPER_ORE, 18, 2).between(40, 86)), + COPPER_ORE_OCEAN(new CountedOreFeature(AllBlocks.COPPER_ORE, 15, 4).between(20, 55).inBiomes(OCEAN)), - ZINC_ORE(new CountedOreFeature(AllBlocksNew.ZINC_ORE, 14, 4).between(15, 70)), - ZINC_ORE_DESERT(new CountedOreFeature(AllBlocksNew.ZINC_ORE, 17, 5).between(10, 85).inBiomes(DESERT)), + ZINC_ORE(new CountedOreFeature(AllBlocks.ZINC_ORE, 14, 4).between(15, 70)), + ZINC_ORE_DESERT(new CountedOreFeature(AllBlocks.ZINC_ORE, 17, 5).between(10, 85).inBiomes(DESERT)), LIMESTONE(new ChanceOreFeature(AllPaletteBlocks.LIMESTONE, 128, 1 / 32f).between(30, 70)), WEATHERED_LIMESTONE(new ChanceOreFeature(AllPaletteBlocks.WEATHERED_LIMESTONE, 128, 1 / 32f).between(10, 30)), diff --git a/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java b/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java index 19315fb0c..d4fd81ee1 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/RotationPropagator.java @@ -6,7 +6,7 @@ import static net.minecraft.state.properties.BlockStateProperties.AXIS; import java.util.LinkedList; import java.util.List; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.config.AllConfigs; import com.simibubi.create.modules.contraptions.base.IRotate; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; @@ -179,7 +179,7 @@ public class RotationPropagator { } private static boolean isLargeCogToSpeedController(BlockState from, BlockState to, BlockPos diff) { - if (!isLargeCog(from) || !AllBlocksNew.ROTATION_SPEED_CONTROLLER.has(to)) + if (!isLargeCog(from) || !AllBlocks.ROTATION_SPEED_CONTROLLER.has(to)) return false; if (!diff.equals(BlockPos.ZERO.up()) && !diff.equals(BlockPos.ZERO.down())) return false; @@ -430,7 +430,7 @@ public class RotationPropagator { IRotate block = (IRotate) blockState.getBlock(); if (block.hasIntegratedCogwheel(te.getWorld(), te.getPos(), blockState) || isLargeWheel - || AllBlocksNew.BELT.has(blockState)) { + || AllBlocks.BELT.has(blockState)) { Axis axis = block.getRotationAxis(blockState); BlockPos.getAllInBox(new BlockPos(-1, -1, -1), new BlockPos(1, 1, 1)) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java index 316d803f3..70bdc802f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/base/KineticTileEntityRenderer.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.contraptions.base; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.block.SafeTileEntityRenderer; import com.simibubi.create.foundation.utility.AnimationTickHolder; @@ -102,7 +102,7 @@ public class KineticTileEntityRenderer extends SafeTileEntityRenderer capture(World world, BlockPos pos) { BlockState blockstate = world.getBlockState(pos); - if (AllBlocksNew.SAW.has(blockstate)) + if (AllBlocks.SAW.has(blockstate)) blockstate = blockstate.with(SawBlock.RUNNING, true); if (blockstate.getBlock() instanceof ChestBlock) blockstate = blockstate.with(ChestBlock.TYPE, ChestType.SINGLE); - if (AllBlocksNew.ADJUSTABLE_CRATE.has(blockstate)) + if (AllBlocks.ADJUSTABLE_CRATE.has(blockstate)) blockstate = blockstate.with(AdjustableCrateBlock.DOUBLE, false); - if (AllBlocksNew.REDSTONE_CONTACT.has(blockstate)) + if (AllBlocks.REDSTONE_CONTACT.has(blockstate)) blockstate = blockstate.with(RedstoneContactBlock.POWERED, true); if (blockstate.getBlock() instanceof AbstractButtonBlock) { blockstate = blockstate.with(AbstractButtonBlock.POWERED, false); @@ -588,7 +588,7 @@ public abstract class Contraption { state = state.updatePostPlacement(face, world.getBlockState(targetPos.offset(face)), world, targetPos, targetPos.offset(face)); - if (AllBlocksNew.SAW.has(state)) + if (AllBlocks.SAW.has(state)) state = state.with(SawBlock.RUNNING, false); BlockState blockState = world.getBlockState(targetPos); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionCollider.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionCollider.java index deded5b25..b9bd87e56 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionCollider.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/ContraptionCollider.java @@ -3,7 +3,7 @@ package com.simibubi.create.modules.contraptions.components.contraptions; import java.util.HashMap; import java.util.Map; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.modules.contraptions.components.actors.BlockBreakingMovementBehaviour; import net.minecraft.block.BlockState; @@ -270,7 +270,7 @@ public class ContraptionCollider { } } - if (AllBlocksNew.PULLEY_MAGNET.has(collidedState) && pos.equals(BlockPos.ZERO) + if (AllBlocks.PULLEY_MAGNET.has(collidedState) && pos.equals(BlockPos.ZERO) && movementDirection == Direction.UP) continue; if (collidedState.getBlock() instanceof CocoaBlock) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/StructureTransform.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/StructureTransform.java index 1166ae08d..4484ebcb8 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/StructureTransform.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/StructureTransform.java @@ -5,7 +5,7 @@ import static net.minecraft.state.properties.BlockStateProperties.AXIS; import static net.minecraft.state.properties.BlockStateProperties.FACING; import static net.minecraft.state.properties.BlockStateProperties.HORIZONTAL_FACING; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.DirectionHelper; import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.modules.contraptions.base.DirectionalAxisKineticBlock; @@ -146,7 +146,7 @@ public class StructureTransform { return state; } - if (AllBlocksNew.BELT.has(state)) { + if (AllBlocks.BELT.has(state)) { if (state.get(BeltBlock.HORIZONTAL_FACING).getAxis() != rotationAxis) { for (int i = 0; i < rotation.ordinal(); i++) { Slope slope = state.get(BeltBlock.SLOPE); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/ChassisTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/ChassisTileEntity.java index a1cd9f36f..a2bb592cc 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/ChassisTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/ChassisTileEntity.java @@ -9,7 +9,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; import com.simibubi.create.config.AllConfigs; import com.simibubi.create.foundation.behaviour.CenteredSideValueBoxTransform; @@ -111,7 +111,7 @@ public class ChassisTileEntity extends SmartTileEntity { return false; BlockState neighbourState = world.getBlockState(currentPos); - if (!AllBlocksNew.RADIAL_CHASSIS.has(neighbourState)) + if (!AllBlocks.RADIAL_CHASSIS.has(neighbourState)) continue; if (axis != neighbourState.get(BlockStateProperties.AXIS)) continue; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java index 4433b50a0..6b7c1b3fa 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/chassis/LinearChassisBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.contraptions.components.contraptions.chassis; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllSpriteShifts; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; @@ -58,7 +58,7 @@ public class LinearChassisBlock extends AbstractChassisBlock { } public static boolean isChassis(BlockState state) { - return AllBlocksNew.LINEAR_CHASSIS.has(state) || AllBlocksNew.LINEAR_CHASSIS_SECONDARY.has(state); + return AllBlocks.LINEAR_CHASSIS.has(state) || AllBlocks.LINEAR_CHASSIS_SECONDARY.has(state); } public static boolean sameKind(BlockState state1, BlockState state2) { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/CartAssemblerBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/CartAssemblerBlock.java index 5eb76ce99..a3c5cdbef 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/CartAssemblerBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/mounted/CartAssemblerBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.contraptions.components.contraptions.mounted; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.IWrenchable; @@ -189,7 +189,7 @@ public class CartAssemblerBlock extends AbstractRailBlock implements ITE capture(World world, BlockPos pos) { Pair pair = super.capture(world, pos); BlockInfo capture = pair.getKey(); - if (AllBlocksNew.CART_ASSEMBLER.has(capture.state)) + if (AllBlocks.CART_ASSEMBLER.has(capture.state)) return Pair.of(new BlockInfo(capture.pos, CartAssemblerBlock.createAnchor(capture.state), null), pair.getValue()); return pair; @@ -108,7 +108,7 @@ public class MountedContraption extends Contraption { @Override public void addBlocksToWorld(World world, BlockPos offset, Vec3d rotation) { - super.addBlocksToWorld(world, offset, rotation, (pos, state) -> AllBlocksNew.MINECART_ANCHOR.has(state)); + super.addBlocksToWorld(world, offset, rotation, (pos, state) -> AllBlocks.MINECART_ANCHOR.has(state)); } } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonBlock.java index 073e59180..6883d15ab 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.contraptions.components.contraptions.piston; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.config.AllConfigs; import com.simibubi.create.foundation.block.ITE; @@ -91,7 +91,7 @@ public class MechanicalPistonBlock extends DirectionalAxisKineticBlock implement if (!player.isCreative()) player.getHeldItem(handIn) .shrink(1); - worldIn.setBlockState(pos, AllBlocksNew.STICKY_MECHANICAL_PISTON.getDefaultState() + worldIn.setBlockState(pos, AllBlocks.STICKY_MECHANICAL_PISTON.getDefaultState() .with(FACING, direction) .with(AXIS_ALONG_FIRST_COORDINATE, state.get(AXIS_ALONG_FIRST_COORDINATE))); return ActionResultType.SUCCESS; @@ -190,18 +190,18 @@ public class MechanicalPistonBlock extends DirectionalAxisKineticBlock implement } public static boolean isPiston(BlockState state) { - return AllBlocksNew.MECHANICAL_PISTON.has(state) || isStickyPiston(state); + return AllBlocks.MECHANICAL_PISTON.has(state) || isStickyPiston(state); } public static boolean isStickyPiston(BlockState state) { - return AllBlocksNew.STICKY_MECHANICAL_PISTON.has(state); + return AllBlocks.STICKY_MECHANICAL_PISTON.has(state); } public static boolean isExtensionPole(BlockState state) { - return AllBlocksNew.PISTON_EXTENSION_POLE.has(state); + return AllBlocks.PISTON_EXTENSION_POLE.has(state); } public static boolean isPistonHead(BlockState state) { - return AllBlocksNew.MECHANICAL_PISTON_HEAD.has(state); + return AllBlocks.MECHANICAL_PISTON_HEAD.has(state); } } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonHeadBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonHeadBlock.java index 51d0c3e76..8ffe21652 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonHeadBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonHeadBlock.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.contraptions.components.contraptions.piston; import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isExtensionPole; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.block.ProperDirectionalBlock; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.PistonState; @@ -46,7 +46,7 @@ public class MechanicalPistonHeadBlock extends ProperDirectionalBlock { @Override public ItemStack getPickBlock(BlockState state, RayTraceResult target, IBlockReader world, BlockPos pos, PlayerEntity player) { - return AllBlocksNew.PISTON_EXTENSION_POLE.asStack(); + return AllBlocks.PISTON_EXTENSION_POLE.asStack(); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonTileEntity.java index f193ade6a..b71d5cdc2 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/MechanicalPistonTileEntity.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.contraptions.components.contraptions.piston; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.utility.ServerSpeedProvider; @@ -100,7 +100,7 @@ public class MechanicalPistonTileEntity extends LinearActuatorTileEntity { sendData(); if (removed) - AllBlocksNew.MECHANICAL_PISTON.get().onBlockHarvested(world, pos, getBlockState(), null); + AllBlocks.MECHANICAL_PISTON.get().onBlockHarvested(world, pos, getBlockState(), null); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonContraption.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonContraption.java index 8776d070a..881e700b3 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonContraption.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/piston/PistonContraption.java @@ -1,7 +1,7 @@ package com.simibubi.create.modules.contraptions.components.contraptions.piston; -import static com.simibubi.create.AllBlocksNew.MECHANICAL_PISTON_HEAD; -import static com.simibubi.create.AllBlocksNew.PISTON_EXTENSION_POLE; +import static com.simibubi.create.AllBlocks.MECHANICAL_PISTON_HEAD; +import static com.simibubi.create.AllBlocks.PISTON_EXTENSION_POLE; import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isExtensionPole; import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isPiston; import static com.simibubi.create.modules.contraptions.components.contraptions.piston.MechanicalPistonBlock.isPistonHead; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyBlock.java index 88148b014..5265f7201 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/contraptions/pulley/PulleyBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.contraptions.components.contraptions.pulley; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.base.HorizontalAxisKineticBlock; @@ -96,7 +96,7 @@ public class PulleyBlock extends HorizontalAxisKineticBlock implements ITE dropItem(ejectPos, stack)); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/RecipeGridHandler.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/RecipeGridHandler.java index 0bbee157b..b69136a39 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/RecipeGridHandler.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crafter/RecipeGridHandler.java @@ -13,7 +13,7 @@ import java.util.function.Predicate; import org.apache.commons.lang3.tuple.Pair; import com.google.common.base.Predicates; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllRecipes; import com.simibubi.create.modules.contraptions.components.crafter.MechanicalCrafterBlock.Pointing; @@ -116,7 +116,7 @@ public class RecipeGridHandler { } private static boolean isCrafter(BlockState state) { - return AllBlocksNew.MECHANICAL_CRAFTER.has(state); + return AllBlocks.MECHANICAL_CRAFTER.has(state); } public static ItemStack tryToApplyRecipe(World world, GroupedItems items) { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java index b9edd9094..243ed744e 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelBlock.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.contraptions.components.crusher; import static com.simibubi.create.modules.contraptions.components.crusher.CrushingWheelControllerBlock.VALID; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.base.RotatedPillarKineticBlock; @@ -55,7 +55,7 @@ public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE if (d.getAxis() == state.get(AXIS) || d.getAxis() .isVertical()) continue; - if (AllBlocksNew.CRUSHING_WHEEL_CONTROLLER.has(worldIn.getBlockState(pos.offset(d)))) + if (AllBlocks.CRUSHING_WHEEL_CONTROLLER.has(worldIn.getBlockState(pos.offset(d)))) worldIn.setBlockState(pos.offset(d), Blocks.AIR.getDefaultState()); } @@ -74,14 +74,14 @@ public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE BlockPos controllerPos = pos.offset(facing); BlockPos otherWheelPos = pos.offset(facing, 2); - boolean controllerExists = AllBlocksNew.CRUSHING_WHEEL_CONTROLLER.has(world.getBlockState(controllerPos)); + boolean controllerExists = AllBlocks.CRUSHING_WHEEL_CONTROLLER.has(world.getBlockState(controllerPos)); boolean controllerIsValid = controllerExists && world.getBlockState(controllerPos) .get(VALID); boolean controllerShouldExist = false; boolean controllerShouldBeValid = false; BlockState otherState = world.getBlockState(otherWheelPos); - if (AllBlocksNew.CRUSHING_WHEEL.has(otherState)) { + if (AllBlocks.CRUSHING_WHEEL.has(otherState)) { controllerShouldExist = true; try { @@ -113,14 +113,14 @@ public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE .getMaterial() .isReplaceable()) return; - world.setBlockState(controllerPos, AllBlocksNew.CRUSHING_WHEEL_CONTROLLER.getDefaultState() + world.setBlockState(controllerPos, AllBlocks.CRUSHING_WHEEL_CONTROLLER.getDefaultState() .with(VALID, controllerShouldBeValid)); } else if (controllerIsValid != controllerShouldBeValid) { world.setBlockState(controllerPos, world.getBlockState(controllerPos) .with(VALID, controllerShouldBeValid)); } - ((CrushingWheelControllerBlock) AllBlocksNew.CRUSHING_WHEEL_CONTROLLER.get()) + ((CrushingWheelControllerBlock) AllBlocks.CRUSHING_WHEEL_CONTROLLER.get()) .updateSpeed(world.getBlockState(controllerPos), world, controllerPos); } @@ -156,9 +156,9 @@ public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE BlockPos neighbourPos = pos.offset(direction); BlockState neighbourState = worldIn.getBlockState(neighbourPos); Axis stateAxis = state.get(AXIS); - if (AllBlocksNew.CRUSHING_WHEEL_CONTROLLER.has(neighbourState) && direction.getAxis() != stateAxis) + if (AllBlocks.CRUSHING_WHEEL_CONTROLLER.has(neighbourState) && direction.getAxis() != stateAxis) return false; - if (!AllBlocksNew.CRUSHING_WHEEL.has(neighbourState)) + if (!AllBlocks.CRUSHING_WHEEL.has(neighbourState)) continue; if (neighbourState.get(AXIS) != stateAxis || stateAxis != direction.getAxis()) return false; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java index c05edd97b..1863a97f7 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/crusher/CrushingWheelControllerBlock.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.contraptions.components.crusher; import java.util.Random; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; @@ -133,7 +133,7 @@ public class CrushingWheelControllerBlock extends Block if (d.getAxis().isVertical()) continue; BlockState neighbour = world.getBlockState(pos.offset(d)); - if (!AllBlocksNew.CRUSHING_WHEEL.has(neighbour)) + if (!AllBlocks.CRUSHING_WHEEL.has(neighbour)) continue; if (neighbour.get(BlockStateProperties.AXIS) == d.getAxis()) continue; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java index 735a7aefd..2a52c822e 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerTileEntity.java @@ -11,7 +11,7 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; @@ -326,7 +326,7 @@ public class DeployerTileEntity extends KineticTileEntity { } protected Vec3d getMovementVector() { - if (!AllBlocksNew.DEPLOYER.has(getBlockState())) + if (!AllBlocks.DEPLOYER.has(getBlockState())) return Vec3d.ZERO; return new Vec3d(getBlockState().get(FACING).getDirectionVec()); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/NozzleBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/NozzleBlock.java index 9c01124e7..6e8a7ac26 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/NozzleBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/NozzleBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.contraptions.components.fan; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.block.ProperDirectionalBlock; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.IWrenchable; @@ -67,7 +67,7 @@ public class NozzleBlock extends ProperDirectionalBlock implements IWrenchable { public boolean isValidPosition(BlockState state, IWorldReader worldIn, BlockPos pos) { Direction towardsFan = state.get(FACING).getOpposite(); BlockState fanState = worldIn.getBlockState(pos.offset(towardsFan)); - return AllBlocksNew.ENCASED_FAN.has(fanState) + return AllBlocks.ENCASED_FAN.has(fanState) && fanState.get(EncasedFanBlock.FACING) == towardsFan.getOpposite(); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineTileEntity.java index 964b10aa6..9c23ce63c 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/EngineTileEntity.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.contraptions.components.flywheel.engine; import java.util.List; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; import com.simibubi.create.modules.contraptions.components.flywheel.FlywheelBlock; @@ -54,7 +54,7 @@ public class EngineTileEntity extends SmartTileEntity { Direction engineFacing = getBlockState().get(EngineBlock.HORIZONTAL_FACING); BlockPos wheelPos = pos.offset(engineFacing, 2); BlockState wheelState = world.getBlockState(wheelPos); - if (!AllBlocksNew.FLYWHEEL.has(wheelState)) + if (!AllBlocks.FLYWHEEL.has(wheelState)) return; Direction wheelFacing = wheelState.get(FlywheelBlock.HORIZONTAL_FACING); if (wheelFacing.getAxis() != engineFacing.rotateY().getAxis()) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineBlock.java index 49fe83941..5c9e84380 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/flywheel/engine/FurnaceEngineBlock.java @@ -1,7 +1,7 @@ package com.simibubi.create.modules.contraptions.components.flywheel.engine; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.foundation.utility.WrappedWorld; @@ -69,7 +69,7 @@ public class FurnaceEngineBlock extends EngineBlock implements ITE, IWrenchab @Override public void onLanded(IBlockReader worldIn, Entity entityIn) { super.onLanded(worldIn, entityIn); - if (!AllBlocksNew.BASIN.has(worldIn.getBlockState(entityIn.getPosition()))) + if (!AllBlocks.BASIN.has(worldIn.getBlockState(entityIn.getPosition()))) return; if (!(entityIn instanceof ItemEntity)) return; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/redstone/ContactMovementBehaviour.java b/src/main/java/com/simibubi/create/modules/contraptions/redstone/ContactMovementBehaviour.java index 228323a59..9e30fd8cd 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/redstone/ContactMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/redstone/ContactMovementBehaviour.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.contraptions.redstone; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.modules.contraptions.components.contraptions.MovementBehaviour; import com.simibubi.create.modules.contraptions.components.contraptions.MovementContext; @@ -32,7 +32,7 @@ public class ContactMovementBehaviour extends MovementBehaviour { deactivateLastVisitedContact(context); BlockState visitedState = world.getBlockState(pos); - if (!AllBlocksNew.REDSTONE_CONTACT.has(visitedState)) + if (!AllBlocks.REDSTONE_CONTACT.has(visitedState)) return; Vec3d contact = new Vec3d(block.get(RedstoneContactBlock.FACING).getDirectionVec()); @@ -54,7 +54,7 @@ public class ContactMovementBehaviour extends MovementBehaviour { public void deactivateLastVisitedContact(MovementContext context) { if (context.data.contains("lastContact")) { BlockPos last = NBTUtil.readBlockPos(context.data.getCompound("lastContact")); - context.world.getPendingBlockTicks().scheduleTick(last, AllBlocksNew.REDSTONE_CONTACT.get(), 1, TickPriority.NORMAL); + context.world.getPendingBlockTicks().scheduleTick(last, AllBlocks.REDSTONE_CONTACT.get(), 1, TickPriority.NORMAL); context.data.remove("lastContact"); } } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/redstone/RedstoneContactBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/redstone/RedstoneContactBlock.java index 85a4fc912..3e086fef5 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/redstone/RedstoneContactBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/redstone/RedstoneContactBlock.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.contraptions.redstone; import java.util.Random; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.block.ProperDirectionalBlock; import com.simibubi.create.modules.contraptions.IWrenchable; import com.simibubi.create.modules.contraptions.components.contraptions.IPortableBlock; @@ -81,7 +81,7 @@ public class RedstoneContactBlock extends ProperDirectionalBlock implements IPor public static boolean hasValidContact(IWorld world, BlockPos pos, Direction direction) { BlockState blockState = world.getBlockState(pos.offset(direction)); - return AllBlocksNew.REDSTONE_CONTACT.has(blockState) && blockState.get(FACING) == direction.getOpposite(); + return AllBlocks.REDSTONE_CONTACT.has(blockState) && blockState.get(FACING) == direction.getOpposite(); } @Override diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java index 52ebd9b35..a5be9d539 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/advanced/sequencer/SequencedGearshiftScreen.java @@ -3,7 +3,7 @@ package com.simibubi.create.modules.contraptions.relays.advanced.sequencer; import java.util.Vector; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllPackets; import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.AbstractSimiScreen; @@ -18,7 +18,7 @@ import net.minecraft.util.math.BlockPos; public class SequencedGearshiftScreen extends AbstractSimiScreen { - private final ItemStack renderedItem = new ItemStack(AllBlocksNew.SEQUENCED_GEARSHIFT.get()); + private final ItemStack renderedItem = new ItemStack(AllBlocks.SEQUENCED_GEARSHIFT.get()); private final ScreenResources background = ScreenResources.SEQUENCER; private final String title = Lang.translate("gui.sequenced_gearshift.title"); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/AllBeltAttachments.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/AllBeltAttachments.java index 4480d4aaf..bbbab1b93 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/AllBeltAttachments.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/AllBeltAttachments.java @@ -4,7 +4,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Consumer; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.Create; import com.simibubi.create.modules.contraptions.relays.belt.transport.TransportedItemStack; @@ -21,10 +21,10 @@ import net.minecraft.world.World; public enum AllBeltAttachments { //TODO rework this nonsense - BELT_FUNNEL(AllBlocksNew.FUNNEL.get()), - BELT_OBSERVER(AllBlocksNew.BELT_OBSERVER.get()), - MECHANICAL_PRESS(AllBlocksNew.MECHANICAL_PRESS.get()), - LOGISTICAL_ATTACHABLES(AllBlocksNew.EXTRACTOR.get()), + BELT_FUNNEL(AllBlocks.FUNNEL.get()), + BELT_OBSERVER(AllBlocks.BELT_OBSERVER.get()), + MECHANICAL_PRESS(AllBlocks.MECHANICAL_PRESS.get()), + LOGISTICAL_ATTACHABLES(AllBlocks.EXTRACTOR.get()), ; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java index a1066d254..5adbb4de8 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltBlock.java @@ -7,7 +7,7 @@ import java.util.List; import org.apache.commons.lang3.mutable.MutableInt; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.block.IHaveColorHandler; import com.simibubi.create.foundation.block.ITE; @@ -122,11 +122,11 @@ public class BeltBlock extends HorizontalKineticBlock public List getDrops(BlockState state, net.minecraft.world.storage.loot.LootContext.Builder builder) { List drops = super.getDrops(state, builder); if (state.get(CASING)) - drops.addAll(AllBlocksNew.BRASS_CASING.getDefaultState() + drops.addAll(AllBlocks.BRASS_CASING.getDefaultState() .getDrops(builder)); TileEntity tileEntity = builder.get(LootParameters.BLOCK_ENTITY); if (tileEntity instanceof BeltTileEntity && ((BeltTileEntity) tileEntity).hasPulley()) - drops.addAll(AllBlocksNew.SHAFT.getDefaultState() + drops.addAll(AllBlocks.SHAFT.getDefaultState() .getDrops(builder)); return drops; } @@ -150,9 +150,9 @@ public class BeltBlock extends HorizontalKineticBlock BlockPos entityPosition = entityIn.getPosition(); BlockPos beltPos = null; - if (AllBlocksNew.BELT.has(worldIn.getBlockState(entityPosition))) + if (AllBlocks.BELT.has(worldIn.getBlockState(entityPosition))) beltPos = entityPosition; - else if (AllBlocksNew.BELT.has(worldIn.getBlockState(entityPosition.down()))) + else if (AllBlocks.BELT.has(worldIn.getBlockState(entityPosition.down()))) beltPos = entityPosition.down(); if (beltPos == null) return; @@ -223,9 +223,9 @@ public class BeltBlock extends HorizontalKineticBlock if (player.isSneaking() || !player.isAllowEdit()) return ActionResultType.PASS; ItemStack heldItem = player.getHeldItem(handIn); - boolean isShaft = heldItem.getItem() == AllBlocksNew.SHAFT.get() + boolean isShaft = heldItem.getItem() == AllBlocks.SHAFT.get() .asItem(); - boolean isCasing = heldItem.getItem() == AllBlocksNew.BRASS_CASING.get() + boolean isCasing = heldItem.getItem() == AllBlocks.BRASS_CASING.get() .asItem(); boolean isDye = Tags.Items.DYES.contains(heldItem.getItem()); boolean isHand = heldItem.isEmpty() && handIn == Hand.MAIN_HAND; @@ -297,7 +297,7 @@ public class BeltBlock extends HorizontalKineticBlock return ActionResultType.SUCCESS; world.setBlockState(context.getPos(), state.with(CASING, false), 3); if (!player.isCreative()) - player.inventory.placeItemBackInInventory(world, AllBlocksNew.BRASS_CASING.asStack()); + player.inventory.placeItemBackInInventory(world, AllBlocks.BRASS_CASING.asStack()); return ActionResultType.SUCCESS; } @@ -311,7 +311,7 @@ public class BeltBlock extends HorizontalKineticBlock belt.attachKinetics(); } if (!player.isCreative()) - player.inventory.placeItemBackInInventory(world, AllBlocksNew.SHAFT.asStack()); + player.inventory.placeItemBackInInventory(world, AllBlocks.SHAFT.asStack()); return ActionResultType.SUCCESS; } @@ -425,14 +425,14 @@ public class BeltBlock extends HorizontalKineticBlock return; BlockState state = world.getBlockState(pos); - if (!AllBlocksNew.BELT.has(state)) + if (!AllBlocks.BELT.has(state)) return; // Find controller int limit = 1000; BlockPos currentPos = pos; while (limit-- > 0) { BlockState currentState = world.getBlockState(currentPos); - if (!AllBlocksNew.BELT.has(currentState)) { + if (!AllBlocks.BELT.has(currentState)) { world.destroyBlock(pos, true); return; } @@ -456,7 +456,7 @@ public class BeltBlock extends HorizontalKineticBlock TileEntity tileEntity = world.getTileEntity(beltPos); BlockState currentState = world.getBlockState(beltPos); - if (tileEntity instanceof BeltTileEntity && AllBlocksNew.BELT.has(currentState)) { + if (tileEntity instanceof BeltTileEntity && AllBlocks.BELT.has(currentState)) { BeltTileEntity te = (BeltTileEntity) tileEntity; te.setController(currentPos); te.beltLength = beltChain.size(); @@ -468,7 +468,7 @@ public class BeltBlock extends HorizontalKineticBlock boolean isVertical = currentState.get(BeltBlock.SLOPE) == Slope.VERTICAL; if (currentState.get(CASING) && isVertical) { - Block.spawnAsEntity(world, beltPos, AllBlocksNew.BRASS_CASING.asStack()); + Block.spawnAsEntity(world, beltPos, AllBlocks.BRASS_CASING.asStack()); world.setBlockState(beltPos, currentState.with(CASING, false), 2); } @@ -505,10 +505,10 @@ public class BeltBlock extends HorizontalKineticBlock if (currentPos == null) continue; BlockState currentState = world.getBlockState(currentPos); - if (!AllBlocksNew.BELT.has(currentState)) + if (!AllBlocks.BELT.has(currentState)) continue; if (currentState.get(CASING)) - Block.spawnAsEntity(world, currentPos, AllBlocksNew.BRASS_CASING.asStack()); + Block.spawnAsEntity(world, currentPos, AllBlocks.BRASS_CASING.asStack()); boolean hasPulley = false; TileEntity tileEntity = world.getTileEntity(currentPos); @@ -522,7 +522,7 @@ public class BeltBlock extends HorizontalKineticBlock hasPulley = te.hasPulley(); } - BlockState shaftState = AllBlocksNew.SHAFT.getDefaultState() + BlockState shaftState = AllBlocks.SHAFT.getDefaultState() .with(BlockStateProperties.AXIS, getRotationAxis(currentState)); world.setBlockState(currentPos, hasPulley ? shaftState : Blocks.AIR.getDefaultState(), 3); world.playEvent(2001, currentPos, Block.getStateId(currentState)); @@ -536,7 +536,7 @@ public class BeltBlock extends HorizontalKineticBlock int offset = isEnd ? -1 : 1; BlockPos tunnelPos = pos.offset(beltState.get(HORIZONTAL_FACING), offset) .up(); - if (AllBlocksNew.BELT_TUNNEL.has(world.getBlockState(tunnelPos))) + if (AllBlocks.BELT_TUNNEL.has(world.getBlockState(tunnelPos))) BeltTunnelBlock.updateTunnel(world, tunnelPos); } @@ -562,14 +562,14 @@ public class BeltBlock extends HorizontalKineticBlock List positions = new LinkedList<>(); BlockState blockState = world.getBlockState(controllerPos); - if (!AllBlocksNew.BELT.has(blockState)) + if (!AllBlocks.BELT.has(blockState)) return positions; int limit = 1000; BlockPos current = controllerPos; while (limit-- > 0 && current != null) { BlockState state = world.getBlockState(current); - if (!AllBlocksNew.BELT.has(state)) + if (!AllBlocks.BELT.has(state)) break; positions.add(current); current = nextSegmentPosition(state, current, true); @@ -642,9 +642,9 @@ public class BeltBlock extends HorizontalKineticBlock public ItemRequirement getRequiredItems(BlockState state) { List required = new ArrayList<>(); if (state.get(PART) != Part.MIDDLE) - required.add(AllBlocksNew.SHAFT.asStack()); + required.add(AllBlocks.SHAFT.asStack()); if (state.get(CASING)) - required.add(AllBlocksNew.BRASS_CASING.asStack()); + required.add(AllBlocks.BRASS_CASING.asStack()); if (state.get(PART) == Part.START) required.add(AllItems.BELT_CONNECTOR.asStack()); if (required.isEmpty()) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntity.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntity.java index 07ec6957f..51246ca40 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntity.java @@ -13,7 +13,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.modules.contraptions.base.KineticTileEntity; @@ -73,7 +73,7 @@ public class BeltTileEntity extends KineticTileEntity { // Init belt if (beltLength == 0) BeltBlock.initBelt(world, pos); - if (!AllBlocksNew.BELT.has(world.getBlockState(pos))) + if (!AllBlocks.BELT.has(world.getBlockState(pos))) return; // Initialize Belt Attachments @@ -253,7 +253,7 @@ public class BeltTileEntity extends KineticTileEntity { } public boolean hasPulley() { - if (!AllBlocksNew.BELT.has(getBlockState())) + if (!AllBlocks.BELT.has(getBlockState())) return false; return getBlockState().get(BeltBlock.PART) != Part.MIDDLE; } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntityRenderer.java index af54190b5..11314d18c 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/BeltTileEntityRenderer.java @@ -7,7 +7,7 @@ import java.util.Random; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import com.simibubi.create.AllBlockPartials; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllSpriteShifts; import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.block.SafeTileEntityRenderer; @@ -48,7 +48,7 @@ public class BeltTileEntityRenderer extends SafeTileEntityRenderer beltsToCreate = getBeltChainBetween(start, end, slope, facing); - BlockState beltBlock = AllBlocksNew.BELT.getDefaultState(); + BlockState beltBlock = AllBlocks.BELT.getDefaultState(); for (BlockPos pos : beltsToCreate) { BeltBlock.Part part = pos.equals(start) ? Part.START : pos.equals(end) ? Part.END : Part.MIDDLE; diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/transport/BeltInventory.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/transport/BeltInventory.java index b83f80720..7f0cb411a 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/transport/BeltInventory.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/transport/BeltInventory.java @@ -7,7 +7,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Function; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.ServerSpeedProvider; import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.BeltAttachmentState; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; @@ -221,8 +221,8 @@ public class BeltInventory { BlockState state = world.getBlockState(nextPosition); // next block is a basin or a saw - if (AllBlocksNew.BASIN.has(state) || AllBlocksNew.SAW.has(state) - || AllBlocksNew.CRUSHING_WHEEL_CONTROLLER.has(state)) { + if (AllBlocks.BASIN.has(state) || AllBlocks.SAW.has(state) + || AllBlocks.CRUSHING_WHEEL_CONTROLLER.has(state)) { TileEntity te = world.getTileEntity(nextPosition); if (te != null) { LazyOptional optional = @@ -248,7 +248,7 @@ public class BeltInventory { } // next block is not a belt - if (!AllBlocksNew.BELT.has(state) || state.get(BeltBlock.SLOPE) == Slope.VERTICAL) { + if (!AllBlocks.BELT.has(state) || state.get(BeltBlock.SLOPE) == Slope.VERTICAL) { if (!Block.hasSolidSide(state, world, nextPosition, movementFacing.getOpposite())) { eject(current); iterator.remove(); @@ -286,7 +286,7 @@ public class BeltInventory { private boolean stuckAtTunnel(int offset, ItemStack stack, Direction movementDirection) { BlockPos pos = BeltHelper.getPositionForOffset(belt, offset).up(); - if (!AllBlocksNew.BELT_TUNNEL.has(belt.getWorld().getBlockState(pos))) + if (!AllBlocks.BELT_TUNNEL.has(belt.getWorld().getBlockState(pos))) return false; TileEntity te = belt.getWorld().getTileEntity(pos); if (te == null || !(te instanceof BeltTunnelTileEntity)) @@ -324,7 +324,7 @@ public class BeltInventory { if (belt.getBlockState().get(BeltBlock.SLOPE) != Slope.HORIZONTAL) return; BlockPos pos = BeltHelper.getPositionForOffset(belt, offset).up(); - if (!AllBlocksNew.BELT_TUNNEL.has(belt.getWorld().getBlockState(pos))) + if (!AllBlocks.BELT_TUNNEL.has(belt.getWorld().getBlockState(pos))) return; TileEntity te = belt.getWorld().getTileEntity(pos); if (te == null || !(te instanceof BeltTunnelTileEntity)) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/transport/BeltMovementHandler.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/transport/BeltMovementHandler.java index cea931530..bc70bd344 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/transport/BeltMovementHandler.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/belt/transport/BeltMovementHandler.java @@ -6,7 +6,7 @@ import static net.minecraft.util.Direction.AxisDirection.POSITIVE; import java.util.List; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.modules.contraptions.components.contraptions.ContraptionEntity; import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.BeltAttachmentState; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; @@ -183,8 +183,8 @@ public class BeltMovementHandler { if (!isPlayer) entityIn.stepHeight = step; - boolean movedPastEndingSlope = onSlope && (AllBlocksNew.BELT.has(world.getBlockState(entityIn.getPosition())) - || AllBlocksNew.BELT.has(world.getBlockState(entityIn.getPosition().down()))); + boolean movedPastEndingSlope = onSlope && (AllBlocks.BELT.has(world.getBlockState(entityIn.getPosition())) + || AllBlocks.BELT.has(world.getBlockState(entityIn.getPosition().down()))); if (movedPastEndingSlope && !movingDown && Math.abs(movementSpeed) > 0) entityIn.setPosition(entityIn.getY(), entityIn.getY() + movement.y, entityIn.getZ()); diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogWheelBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogWheelBlock.java index cc741a9f5..ce5ca93bc 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogWheelBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogWheelBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.contraptions.relays.elementary; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.base.IRotate; import com.simibubi.create.modules.contraptions.relays.advanced.SpeedControllerBlock; @@ -66,7 +66,7 @@ public class CogWheelBlock extends ShaftBlock { BlockState stateBelow = world.getBlockState(context.getPos() .down()); - if (AllBlocksNew.ROTATION_SPEED_CONTROLLER.has(stateBelow) && isLarge) { + if (AllBlocks.ROTATION_SPEED_CONTROLLER.has(stateBelow) && isLarge) { return this.getDefaultState() .with(AXIS, stateBelow.get(SpeedControllerBlock.HORIZONTAL_AXIS) == Axis.X ? Axis.Z : Axis.X); } @@ -96,11 +96,11 @@ public class CogWheelBlock extends ShaftBlock { } public static boolean isSmallCog(BlockState state) { - return AllBlocksNew.COGWHEEL.has(state); + return AllBlocks.COGWHEEL.has(state); } public static boolean isLargeCog(BlockState state) { - return AllBlocksNew.LARGE_COGWHEEL.has(state); + return AllBlocks.LARGE_COGWHEEL.has(state); } public void fillItemGroup(ItemGroup group, NonNullList items) { diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogwheelBlockItem.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogwheelBlockItem.java index 5bbafa21f..f8184721e 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogwheelBlockItem.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/CogwheelBlockItem.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.contraptions.relays.elementary; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.VecHelper; @@ -96,7 +96,7 @@ public class CogwheelBlockItem extends BlockItem { continue; if (blockState.get(CogWheelBlock.AXIS) != axis) continue; - if (AllBlocksNew.LARGE_COGWHEEL.has(blockState) == large) + if (AllBlocks.LARGE_COGWHEEL.has(blockState) == large) continue; AllTriggers.triggerFor(AllTriggers.SHIFTING_GEARS, player); } diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftBlock.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftBlock.java index 42f1792d9..85225380e 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftBlock.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/elementary/ShaftBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.contraptions.relays.elementary; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.contraptions.base.RotatedPillarKineticBlock; @@ -66,7 +66,7 @@ public class ShaftBlock extends RotatedPillarKineticBlock { } public static boolean isShaft(BlockState state) { - return AllBlocksNew.SHAFT.has(state); + return AllBlocks.SHAFT.has(state); } // IRotate: diff --git a/src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/VerticalGearboxItem.java b/src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/VerticalGearboxItem.java index 4bf626797..470352c7d 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/VerticalGearboxItem.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/relays/gearbox/VerticalGearboxItem.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.contraptions.relays.gearbox; import java.util.Map; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.modules.contraptions.base.IRotate; import net.minecraft.block.Block; @@ -22,7 +22,7 @@ import net.minecraft.world.World; public class VerticalGearboxItem extends BlockItem { public VerticalGearboxItem(Properties builder) { - super(AllBlocksNew.GEARBOX.get(), builder); + super(AllBlocks.GEARBOX.get(), builder); } @Override diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/AttachedLogisticalBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/AttachedLogisticalBlock.java index 9b5f87ddc..d5c5d9646 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/AttachedLogisticalBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/AttachedLogisticalBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.logistics.block; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.modules.contraptions.IWrenchable; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; import com.simibubi.create.modules.logistics.block.transposer.TransposerBlock; @@ -85,7 +85,7 @@ public abstract class AttachedLogisticalBlock extends HorizontalBlock implements if (neighbour.getBlock() instanceof TransposerBlock) return false; - if (AllBlocksNew.BELT.has(neighbour)) + if (AllBlocks.BELT.has(neighbour)) return BeltBlock.canAccessFromSide(facing, neighbour); return !neighbour.getShape(worldIn, pos).isEmpty(); } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneLinkTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneLinkTileEntity.java index 3bb3cf056..5ea221c3f 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneLinkTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/RedstoneLinkTileEntity.java @@ -6,7 +6,7 @@ import java.util.List; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; @@ -101,7 +101,7 @@ public class RedstoneLinkTileEntity extends SmartTileEntity { if (world.isRemote) return; BlockState blockState = getBlockState(); - if (!AllBlocksNew.REDSTONE_LINK.has(blockState)) + if (!AllBlocks.REDSTONE_LINK.has(blockState)) return; if (receivedSignal != blockState.get(POWERED)) { diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/StockpileSwitchScreen.java b/src/main/java/com/simibubi/create/modules/logistics/block/StockpileSwitchScreen.java index f78161497..bc6294406 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/StockpileSwitchScreen.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/StockpileSwitchScreen.java @@ -5,7 +5,7 @@ import static com.simibubi.create.ScreenResources.STOCKSWITCH; import java.util.Arrays; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllPackets; import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.AbstractSimiScreen; @@ -31,7 +31,7 @@ public class StockpileSwitchScreen extends AbstractSimiScreen { private final String stopAt = Lang.translate("gui.stockswitch.stopAt"); private final String lowerLimit = Lang.translate("gui.stockswitch.lowerLimit"); private final String upperLimit = Lang.translate("gui.stockswitch.upperLimit"); - private final ItemStack renderedItem = new ItemStack(AllBlocksNew.STOCKPILE_SWITCH.get()); + private final ItemStack renderedItem = new ItemStack(AllBlocks.STOCKPILE_SWITCH.get()); private int lastModification; private StockpileSwitchTileEntity te; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverBlock.java index d08c48bb3..3b21e359d 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/belts/observer/BeltObserverBlock.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; import java.util.Random; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.foundation.block.ITE; @@ -91,7 +91,7 @@ public class BeltObserverBlock extends HorizontalBlock Direction direction = state.get(HORIZONTAL_FACING); BlockState blockState = world.getBlockState(pos.offset(direction)); - if (!AllBlocksNew.BELT.has(blockState)) + if (!AllBlocks.BELT.has(blockState)) return false; if (blockState.get(BeltBlock.SLOPE) != Slope.HORIZONTAL) return false; @@ -113,7 +113,7 @@ public class BeltObserverBlock extends HorizontalBlock continue; BlockState blockState = context.getWorld().getBlockState(context.getPos().offset(face)); - if (AllBlocksNew.BELT.has(blockState) + if (AllBlocks.BELT.has(blockState) && blockState.get(BlockStateProperties.HORIZONTAL_FACING).getAxis() != face.getAxis() && blockState.get(BeltBlock.SLOPE) == Slope.HORIZONTAL) if (preferredFacing == null) diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelBlock.java index 48dc7cdf1..f35a356b7 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelBlock.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.block.ITE; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.WrappedWorld; @@ -71,7 +71,7 @@ public class BeltTunnelBlock extends Block implements ITE, @Override public boolean isValidPosition(BlockState state, IWorldReader worldIn, BlockPos pos) { BlockState blockState = worldIn.getBlockState(pos.down()); - if (!AllBlocksNew.BELT.has(blockState)) + if (!AllBlocks.BELT.has(blockState)) return false; if (blockState.get(BeltBlock.SLOPE) != Slope.HORIZONTAL) return false; @@ -151,10 +151,10 @@ public class BeltTunnelBlock extends Block implements ITE, } private static BlockState getTunnelState(IBlockReader reader, BlockPos pos) { - BlockState state = AllBlocksNew.BELT_TUNNEL.getDefaultState(); + BlockState state = AllBlocks.BELT_TUNNEL.getDefaultState(); BlockState belt = reader.getBlockState(pos.down()); - if (AllBlocksNew.BELT.has(belt)) + if (AllBlocks.BELT.has(belt)) state = state.with(HORIZONTAL_AXIS, belt.get(BeltBlock.HORIZONTAL_FACING) .getAxis()); Axis axis = state.get(HORIZONTAL_AXIS); @@ -164,11 +164,11 @@ public class BeltTunnelBlock extends Block implements ITE, .rotateY(); BlockState leftState = reader.getBlockState(pos.offset(left) .down()); - boolean onLeft = AllBlocksNew.BELT.has(leftState) && leftState.get(BeltBlock.HORIZONTAL_FACING) + boolean onLeft = AllBlocks.BELT.has(leftState) && leftState.get(BeltBlock.HORIZONTAL_FACING) .getAxis() != axis; BlockState rightState = reader.getBlockState(pos.offset(left.getOpposite()) .down()); - boolean onRight = AllBlocksNew.BELT.has(rightState) && rightState.get(BeltBlock.HORIZONTAL_FACING) + boolean onRight = AllBlocks.BELT.has(rightState) && rightState.get(BeltBlock.HORIZONTAL_FACING) .getAxis() != axis; if (onLeft && onRight) @@ -180,8 +180,8 @@ public class BeltTunnelBlock extends Block implements ITE, if (state.get(SHAPE) == Shape.STRAIGHT) { Direction fw = Direction.getFacingFromAxis(AxisDirection.POSITIVE, axis); - if (AllBlocksNew.BELT_TUNNEL.has(reader.getBlockState(pos.offset(fw))) - && AllBlocksNew.BELT_TUNNEL.has(reader.getBlockState(pos.offset(fw.getOpposite())))) + if (AllBlocks.BELT_TUNNEL.has(reader.getBlockState(pos.offset(fw))) + && AllBlocks.BELT_TUNNEL.has(reader.getBlockState(pos.offset(fw.getOpposite())))) state = state.with(SHAPE, Shape.WINDOW); } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelTileEntity.java index de44ee7d1..56d54c5a9 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/belts/tunnel/BeltTunnelTileEntity.java @@ -6,7 +6,7 @@ import java.util.List; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.block.SyncedTileEntity; import com.simibubi.create.foundation.gui.widgets.InterpolatedChasingValue; @@ -51,7 +51,7 @@ public class BeltTunnelTileEntity extends SyncedTileEntity implements ITickableT if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { if (!this.cap.isPresent()) { - if (AllBlocksNew.BELT.has(world.getBlockState(pos.down()))) { + if (AllBlocks.BELT.has(world.getBlockState(pos.down()))) { TileEntity teBelow = world.getTileEntity(pos.down()); if (teBelow != null) { T capBelow = teBelow.getCapability(capability, Direction.UP).orElse(null); @@ -150,7 +150,7 @@ public class BeltTunnelTileEntity extends SyncedTileEntity implements ITickableT for (Direction direction : Direction.values()) { if (direction.getAxis().isVertical()) continue; - if (AllBlocksNew.BELT_TUNNEL.has(world.getBlockState(pos.offset(direction)))) + if (AllBlocks.BELT_TUNNEL.has(world.getBlockState(pos.offset(direction)))) continue; if (direction.getAxis() != tunnelState.get(BlockStateProperties.HORIZONTAL_AXIS)) { boolean positive = direction.getAxisDirection() == AxisDirection.POSITIVE diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterBlock.java index acb46336f..8b2758e1d 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/diodes/AdjustableRepeaterBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.logistics.block.diodes; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -34,7 +34,7 @@ public class AdjustableRepeaterBlock extends AbstractDiodeBlock { @Override public TileEntity createTileEntity(BlockState state, IBlockReader world) { - return AllBlocksNew.ADJUSTABLE_REPEATER.get() == this ? new AdjustableRepeaterTileEntity() + return AllBlocks.ADJUSTABLE_REPEATER.get() == this ? new AdjustableRepeaterTileEntity() : new AdjustablePulseRepeaterTileEntity(); } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorBlock.java index f10b9860c..cc9f11b58 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.logistics.block.extractor; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; @@ -41,12 +41,12 @@ public class ExtractorBlock extends BeltAttachableLogisticalBlock implements IPo @Override protected BlockState getVerticalDefaultState() { - return AllBlocksNew.VERTICAL_EXTRACTOR.getDefaultState(); + return AllBlocks.VERTICAL_EXTRACTOR.getDefaultState(); } @Override protected BlockState getHorizontalDefaultState() { - return AllBlocksNew.EXTRACTOR.getDefaultState(); + return AllBlocks.EXTRACTOR.getDefaultState(); } @Override diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorTileEntity.java index 75f3649c9..05a2a630c 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/ExtractorTileEntity.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.logistics.block.extractor; import java.util.List; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; import com.simibubi.create.config.AllConfigs; import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; @@ -55,7 +55,7 @@ public class ExtractorTileEntity extends SmartTileEntity { } protected void onExtract(ItemStack stack) { - if (AllBlocksNew.BELT.has(world.getBlockState(pos.down()))) { + if (AllBlocks.BELT.has(world.getBlockState(pos.down()))) { TileEntity te = world.getTileEntity(pos.down()); if (te instanceof BeltTileEntity) { if (((BeltTileEntity) te).tryInsertingFromSide(Direction.UP, stack, false)) @@ -78,11 +78,11 @@ public class ExtractorTileEntity extends SmartTileEntity { protected boolean isAttachedToBelt() { Direction blockFacing = AttachedLogisticalBlock.getBlockFacing(getBlockState()); - return AllBlocksNew.BELT.has(world.getBlockState(pos.offset(blockFacing))); + return AllBlocks.BELT.has(world.getBlockState(pos.offset(blockFacing))); } protected boolean isTargetingBelt() { - if (!AllBlocksNew.BELT.has(world.getBlockState(pos.down()))) + if (!AllBlocks.BELT.has(world.getBlockState(pos.down()))) return false; TileEntity te = world.getTileEntity(pos.down()); if (te == null || !(te instanceof BeltTileEntity)) @@ -99,7 +99,7 @@ public class ExtractorTileEntity extends SmartTileEntity { } protected boolean canExtract() { - if (AllBlocksNew.BELT.has(world.getBlockState(pos.down()))) { + if (AllBlocks.BELT.has(world.getBlockState(pos.down()))) { TileEntity te = world.getTileEntity(pos.down()); if (te instanceof BeltTileEntity) { BeltTileEntity belt = (BeltTileEntity) te; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorBlock.java index 00b6dd5aa..475279336 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/extractor/LinkedExtractorBlock.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.logistics.block.extractor; import org.apache.commons.lang3.tuple.Pair; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; import com.simibubi.create.modules.logistics.block.AttachedLogisticalBlock; @@ -21,12 +21,12 @@ public class LinkedExtractorBlock extends ExtractorBlock { @Override protected BlockState getVerticalDefaultState() { - return AllBlocksNew.VERTICAL_LINKED_EXTRACTOR.getDefaultState(); + return AllBlocks.VERTICAL_LINKED_EXTRACTOR.getDefaultState(); } @Override protected BlockState getHorizontalDefaultState() { - return AllBlocksNew.LINKED_EXTRACTOR.getDefaultState(); + return AllBlocks.LINKED_EXTRACTOR.getDefaultState(); } @Override diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelBlock.java index a88a8445c..66c4e721c 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelBlock.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; import com.simibubi.create.foundation.behaviour.filtering.FilteringBehaviour; import com.simibubi.create.foundation.block.ITE; @@ -89,12 +89,12 @@ public class FunnelBlock extends AttachedLogisticalBlock @Override protected BlockState getVerticalDefaultState() { - return AllBlocksNew.VERTICAL_FUNNEL.getDefaultState(); + return AllBlocks.VERTICAL_FUNNEL.getDefaultState(); } @Override protected BlockState getHorizontalDefaultState() { - return AllBlocksNew.FUNNEL.getDefaultState(); + return AllBlocks.FUNNEL.getDefaultState(); } @Override @@ -117,7 +117,7 @@ public class FunnelBlock extends AttachedLogisticalBlock } protected boolean isOnBelt(IWorld world, BlockPos pos) { - return AllBlocksNew.BELT.has(world.getBlockState(pos.down())); + return AllBlocks.BELT.has(world.getBlockState(pos.down())); } @Override diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelTileEntity.java index 9fc1114b3..1eb2a3d98 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/funnel/FunnelTileEntity.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.logistics.block.funnel; import java.util.List; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.behaviour.base.SmartTileEntity; @@ -102,7 +102,7 @@ public class FunnelTileEntity extends SmartTileEntity { protected BeltTileEntity getTargetingBelt() { BlockPos targetPos = pos.offset(AttachedLogisticalBlock.getBlockFacing(getBlockState())); - if (!AllBlocksNew.BELT.has(world.getBlockState(targetPos))) + if (!AllBlocks.BELT.has(world.getBlockState(targetPos))) return null; return BeltHelper.getSegmentTE(world, targetPos); } diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateBlock.java index 6b30ea853..dccd37154 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.logistics.block.inventories; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.item.ItemHelper; import net.minecraft.block.BlockState; @@ -74,7 +74,7 @@ public class AdjustableCrateBlock extends CrateBlock { public static void splitCrate(World world, BlockPos pos) { BlockState state = world.getBlockState(pos); - if (!AllBlocksNew.ADJUSTABLE_CRATE.has(state)) + if (!AllBlocks.ADJUSTABLE_CRATE.has(state)) return; if (!state.get(DOUBLE)) return; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateScreen.java b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateScreen.java index d5163832e..05ce91840 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateScreen.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateScreen.java @@ -8,7 +8,7 @@ import java.util.ArrayList; import java.util.List; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllPackets; import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.AbstractSimiContainerScreen; @@ -32,7 +32,7 @@ public class AdjustableCrateScreen extends AbstractSimiContainerScreen extraAreas; - private final ItemStack renderedItem = new ItemStack(AllBlocksNew.ADJUSTABLE_CRATE.get()); + private final ItemStack renderedItem = new ItemStack(AllBlocks.ADJUSTABLE_CRATE.get()); private final String title = Lang.translate("gui.flexcrate.title"); private final String storageSpace = Lang.translate("gui.flexcrate.storageSpace"); @@ -114,7 +114,7 @@ public class AdjustableCrateScreen extends AbstractSimiContainerScreen= 0) diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateTileEntity.java index b220a9e0a..5ec7433a5 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/AdjustableCrateTileEntity.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.logistics.block.inventories; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; import net.minecraft.entity.player.PlayerEntity; @@ -80,7 +80,7 @@ public class AdjustableCrateTileEntity extends CrateTileEntity implements INamed } public AdjustableCrateTileEntity getOtherCrate() { - if (!AllBlocksNew.ADJUSTABLE_CRATE.has(getBlockState())) + if (!AllBlocks.ADJUSTABLE_CRATE.has(getBlockState())) return null; TileEntity tileEntity = world.getTileEntity(pos.offset(getFacing())); if (tileEntity instanceof AdjustableCrateTileEntity) diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/CreativeCrateTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/CreativeCrateTileEntity.java index 2d8a3493c..f46574a42 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/CreativeCrateTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/CreativeCrateTileEntity.java @@ -3,7 +3,7 @@ package com.simibubi.create.modules.logistics.block.inventories; import java.util.List; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; @@ -58,7 +58,7 @@ public class CreativeCrateTileEntity extends CrateTileEntity { } private CreativeCrateTileEntity getOtherCrate() { - if (!AllBlocksNew.CREATIVE_CRATE.has(getBlockState())) + if (!AllBlocks.CREATIVE_CRATE.has(getBlockState())) return null; TileEntity tileEntity = world.getTileEntity(pos.offset(getFacing())); if (tileEntity instanceof CreativeCrateTileEntity) diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/transposer/LinkedTransposerBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/LinkedTransposerBlock.java index d088d9fe7..5f5c13f5f 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/transposer/LinkedTransposerBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/LinkedTransposerBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.logistics.block.transposer; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; @@ -14,12 +14,12 @@ public class LinkedTransposerBlock extends TransposerBlock { @Override protected BlockState getVerticalDefaultState() { - return AllBlocksNew.VERTICAL_LINKED_TRANSPOSER.getDefaultState(); + return AllBlocks.VERTICAL_LINKED_TRANSPOSER.getDefaultState(); } @Override protected BlockState getHorizontalDefaultState() { - return AllBlocksNew.LINKED_TRANSPOSER.getDefaultState(); + return AllBlocks.LINKED_TRANSPOSER.getDefaultState(); } @Override diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerBlock.java index 695a8837f..c700eddd1 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.modules.logistics.block.transposer; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.foundation.utility.AllShapes; import com.simibubi.create.modules.logistics.block.belts.BeltAttachableLogisticalBlock; @@ -58,12 +58,12 @@ public class TransposerBlock extends BeltAttachableLogisticalBlock { @Override protected BlockState getVerticalDefaultState() { - return AllBlocksNew.VERTICAL_TRANSPOSER.getDefaultState(); + return AllBlocks.VERTICAL_TRANSPOSER.getDefaultState(); } @Override protected BlockState getHorizontalDefaultState() { - return AllBlocksNew.TRANSPOSER.getDefaultState(); + return AllBlocks.TRANSPOSER.getDefaultState(); } @Override diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerTileEntity.java b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerTileEntity.java index 47db4b096..751786bb8 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerTileEntity.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/transposer/TransposerTileEntity.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.logistics.block.transposer; import java.util.List; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTileEntities; import com.simibubi.create.foundation.behaviour.base.TileEntityBehaviour; import com.simibubi.create.foundation.behaviour.inventory.InsertingBehaviour; @@ -69,7 +69,7 @@ public class TransposerTileEntity extends ExtractorTileEntity { @Override protected boolean isTargetingBelt() { BlockPos targetPos = pos.offset(AttachedLogisticalBlock.getBlockFacing(getBlockState()).getOpposite()); - if (!AllBlocksNew.BELT.has(world.getBlockState(targetPos))) + if (!AllBlocks.BELT.has(world.getBlockState(targetPos))) return false; TileEntity te = world.getTileEntity(targetPos); if (te == null || !(te instanceof BeltTileEntity)) diff --git a/src/main/java/com/simibubi/create/modules/schematics/ServerSchematicLoader.java b/src/main/java/com/simibubi/create/modules/schematics/ServerSchematicLoader.java index 06f433322..4ed7c7688 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/ServerSchematicLoader.java +++ b/src/main/java/com/simibubi/create/modules/schematics/ServerSchematicLoader.java @@ -14,7 +14,7 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Stream; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.Create; import com.simibubi.create.config.AllConfigs; import com.simibubi.create.config.CSchematics; @@ -226,7 +226,7 @@ public class ServerSchematicLoader { return; BlockState blockState = dimpos.world.getBlockState(dimpos.pos); - if (AllBlocksNew.SCHEMATIC_TABLE.get() != blockState.getBlock()) + if (AllBlocks.SCHEMATIC_TABLE.get() != blockState.getBlock()) return; SchematicTableTileEntity table = getTable(dimpos); diff --git a/src/main/java/com/simibubi/create/modules/schematics/block/LaunchedItem.java b/src/main/java/com/simibubi/create/modules/schematics/block/LaunchedItem.java index 24a9ed6d9..bd87af670 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/block/LaunchedItem.java +++ b/src/main/java/com/simibubi/create/modules/schematics/block/LaunchedItem.java @@ -2,7 +2,7 @@ package com.simibubi.create.modules.schematics.block; import java.util.Optional; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Part; import com.simibubi.create.modules.contraptions.relays.belt.item.BeltConnectorItem; @@ -119,7 +119,7 @@ public abstract class LaunchedItem { if (state.has(BlockStateProperties.WATERLOGGED)) state = state.with(BlockStateProperties.WATERLOGGED, Boolean.FALSE); - if (AllBlocksNew.BELT.has(state)) { + if (AllBlocks.BELT.has(state)) { world.setBlockState(target, state, 2); return; } @@ -176,7 +176,7 @@ public abstract class LaunchedItem { BlockPos offset = BeltBlock.nextSegmentPosition(state, BlockPos.ZERO, isStart); int i = length - 1; Axis axis = state.get(BeltBlock.HORIZONTAL_FACING).rotateY().getAxis(); - world.setBlockState(target, AllBlocksNew.SHAFT.getDefaultState().with(ShaftBlock.AXIS, axis)); + world.setBlockState(target, AllBlocks.SHAFT.getDefaultState().with(ShaftBlock.AXIS, axis)); BeltConnectorItem .createBelts(world, target, target.add(offset.getX() * i, offset.getY() * i, offset.getZ() * i)); } diff --git a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableScreen.java b/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableScreen.java index f61774be6..aca44eb2e 100644 --- a/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableScreen.java +++ b/src/main/java/com/simibubi/create/modules/schematics/block/SchematicTableScreen.java @@ -7,7 +7,7 @@ import java.nio.file.Paths; import java.util.List; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllBlocksNew; +import com.simibubi.create.AllBlocks; import com.simibubi.create.CreateClient; import com.simibubi.create.ScreenResources; import com.simibubi.create.foundation.gui.AbstractSimiContainerScreen; @@ -113,7 +113,7 @@ public class SchematicTableScreen extends AbstractSimiContainerScreen