From 467af2ea2006039597da0b3ee3ab0daca9d14d3d Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Thu, 28 May 2020 01:30:14 +0200 Subject: [PATCH] Renamed AllItemsNew to AllItems --- .../{AllItemsNew.java => AllItems.java} | 2 +- src/main/java/com/simibubi/create/Create.java | 2 +- .../simibubi/create/compat/jei/CreateJEI.java | 10 +++--- .../jei/category/BlastingViaFanCategory.java | 4 +-- .../category/BlockzapperUpgradeCategory.java | 4 +-- .../compat/jei/category/CrushingCategory.java | 4 +-- .../compat/jei/category/MillingCategory.java | 4 +-- .../MysteriousItemConversionCategory.java | 8 ++--- .../jei/category/PolishingCategory.java | 6 ++-- .../compat/jei/category/PressingCategory.java | 4 +-- .../jei/category/SmokingViaFanCategory.java | 4 +-- .../jei/category/SplashingCategory.java | 4 +-- .../crafter/MechanicalCrafterBlock.java | 10 +++--- .../crafter/MechanicalCrafterTileEntity.java | 4 +-- .../components/deployer/DeployerBlock.java | 4 +-- .../ChassisRangeDisplay.java | 4 +-- .../chassis/AbstractChassisBlock.java | 4 +-- .../glue/SuperGlueEntity.java | 6 ++-- .../glue/SuperGlueHandler.java | 4 +-- .../glue/SuperGlueRenderer.java | 8 ++--- .../mounted/MinecartContraptionItem.java | 6 ++-- .../goggles/GoggleOverlayRenderer.java | 6 ++-- .../contraptions/goggles/GogglesItem.java | 4 +-- .../sequencer/SequencedGearshiftBlock.java | 4 +-- .../contraptions/relays/belt/BeltBlock.java | 8 ++--- .../belt/item/BeltConnectorHandler.java | 4 +-- .../relays/gearbox/GearboxBlock.java | 8 ++--- .../curiosities/ChromaticCompoundItem.java | 8 ++--- .../curiosities/symmetry/SymmetryHandler.java | 12 +++---- .../curiosities/tools/AllToolTiers.java | 4 +-- .../curiosities/tools/DeforesterItem.java | 4 +-- .../zapper/blockzapper/BlockzapperItem.java | 4 +-- .../blockzapper/BlockzapperRenderHandler.java | 6 ++-- .../blockzapper/BlockzapperUpgradeRecipe.java | 6 ++-- .../WorldshaperRenderHandler.java | 6 ++-- .../block/diodes/ToggleLatchBlock.java | 4 +-- .../block/redstone/StockpileSwitchBlock.java | 4 +-- .../logistics/item/filter/FilterItem.java | 8 ++--- .../block/SchematicTableContainer.java | 10 +++--- .../block/SchematicannonInventory.java | 4 +-- .../block/SchematicannonTileEntity.java | 8 ++--- .../client/SchematicAndQuillHandler.java | 4 +-- .../client/SchematicEditScreen.java | 4 +-- .../schematics/client/SchematicHandler.java | 4 +-- .../schematics/item/SchematicItem.java | 4 +-- .../advancement/AllAdvancements.java | 36 +++++++++---------- .../foundation/item/ItemDescription.java | 4 +-- .../create/foundation/item/TooltipHelper.java | 4 +-- .../scrollvalue/ScrollValueHandler.java | 4 +-- .../scrollvalue/ScrollValueRenderer.java | 4 +-- 50 files changed, 148 insertions(+), 148 deletions(-) rename src/main/java/com/simibubi/create/{AllItemsNew.java => AllItems.java} (99%) diff --git a/src/main/java/com/simibubi/create/AllItemsNew.java b/src/main/java/com/simibubi/create/AllItems.java similarity index 99% rename from src/main/java/com/simibubi/create/AllItemsNew.java rename to src/main/java/com/simibubi/create/AllItems.java index 6b7580de1..c0d9bf80e 100644 --- a/src/main/java/com/simibubi/create/AllItemsNew.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -41,7 +41,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Rarity; import net.minecraft.tags.Tag; -public class AllItemsNew { +public class AllItems { private static final CreateRegistrate REGISTRATE = Create.registrate() .itemGroup(() -> Create.baseCreativeTab); diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index 864c18e3c..7fa85b6b7 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -59,7 +59,7 @@ public class Create { modEventBus.addListener(Create::init); AllBlocks.register(); - AllItemsNew.register(); + AllItems.register(); AllPaletteBlocks.register(); modEventBus.addGenericListener(IRecipeSerializer.class, AllRecipeTypes::register); 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 6d9607d27..54b594db5 100644 --- a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java +++ b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java @@ -5,7 +5,7 @@ import java.util.stream.Collectors; import com.google.common.base.Predicate; import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.Create; import com.simibubi.create.compat.jei.category.BlastingViaFanCategory; @@ -91,7 +91,7 @@ public class CreateJEI implements IModPlugin { @Override public void registerItemSubtypes(ISubtypeRegistration registration) { - registration.useNbtForSubtypes(AllItemsNew.BLOCKZAPPER.get()); + registration.useNbtForSubtypes(AllItems.BLOCKZAPPER.get()); } @Override @@ -159,7 +159,7 @@ public class CreateJEI implements IModPlugin { registration.addRecipeCatalyst(smokingFan, smokingCategory.getUid()); registration.addRecipeCatalyst(blastingFan, blastingCategory.getUid()); registration.addRecipeCatalyst(new ItemStack(AllBlocks.MECHANICAL_PRESS.get()), pressingCategory.getUid()); - registration.addRecipeCatalyst(new ItemStack(AllItemsNew.BLOCKZAPPER.get()), blockzapperCategory.getUid()); + registration.addRecipeCatalyst(new ItemStack(AllItems.BLOCKZAPPER.get()), blockzapperCategory.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()); @@ -167,8 +167,8 @@ public class CreateJEI implements IModPlugin { registration.addRecipeCatalyst(new ItemStack(Blocks.STONECUTTER), blockCuttingCategory.getUid()); registration.addRecipeCatalyst(new ItemStack(AllBlocks.MECHANICAL_PRESS.get()), packingCategory.getUid()); registration.addRecipeCatalyst(new ItemStack(AllBlocks.BASIN.get()), packingCategory.getUid()); - registration.addRecipeCatalyst(AllItemsNew.SAND_PAPER.asStack(), polishingCategory.getUid()); - registration.addRecipeCatalyst(AllItemsNew.RED_SAND_PAPER.asStack(), polishingCategory.getUid()); + registration.addRecipeCatalyst(AllItems.SAND_PAPER.asStack(), polishingCategory.getUid()); + registration.addRecipeCatalyst(AllItems.RED_SAND_PAPER.asStack(), polishingCategory.getUid()); registration .addRecipeCatalyst(new ItemStack(AllBlocks.MECHANICAL_CRAFTER.get()), mechanicalCraftingCategory.getUid()); diff --git a/src/main/java/com/simibubi/create/compat/jei/category/BlastingViaFanCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/BlastingViaFanCategory.java index f8310999c..96b526d40 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/BlastingViaFanCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/BlastingViaFanCategory.java @@ -1,7 +1,7 @@ package com.simibubi.create.compat.jei.category; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.foundation.gui.GuiGameElement; import net.minecraft.fluid.Fluids; @@ -11,7 +11,7 @@ import net.minecraft.item.crafting.AbstractCookingRecipe; public class BlastingViaFanCategory extends ProcessingViaFanCategory { public BlastingViaFanCategory() { - super("blasting_via_fan", doubleItemIcon(AllItemsNew.PROPELLER.get(), Items.LAVA_BUCKET)); + super("blasting_via_fan", doubleItemIcon(AllItems.PROPELLER.get(), Items.LAVA_BUCKET)); } @Override diff --git a/src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java index 93ec66f6e..a094a650d 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/BlockzapperUpgradeCategory.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.stream.Collectors; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.compat.jei.ScreenResourceWrapper; import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperUpgradeRecipe; import com.simibubi.create.foundation.gui.GuiGameElement; @@ -29,7 +29,7 @@ import net.minecraft.util.text.ITextComponent; public class BlockzapperUpgradeCategory extends CreateRecipeCategory { public BlockzapperUpgradeCategory() { - super("blockzapper_upgrade", itemIcon(AllItemsNew.BLOCKZAPPER.get()), + super("blockzapper_upgrade", itemIcon(AllItems.BLOCKZAPPER.get()), new ScreenResourceWrapper(BLOCKZAPPER_UPGRADE_RECIPE)); } diff --git a/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java index a016dcb71..5e95a3c2c 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/CrushingCategory.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.compat.jei.category.animations.AnimatedCrushingWheels; import com.simibubi.create.content.contraptions.components.crusher.AbstractCrushingRecipe; import com.simibubi.create.content.contraptions.processing.ProcessingOutput; @@ -20,7 +20,7 @@ public class CrushingCategory extends CreateRecipeCategory getRecipes() { List recipes = new ArrayList<>(); - recipes.add(ConversionRecipe.create(AllItemsNew.CHROMATIC_COMPOUND.asStack(), AllItemsNew.SHADOW_STEEL.asStack())); - recipes.add(ConversionRecipe.create(AllItemsNew.CHROMATIC_COMPOUND.asStack(), AllItemsNew.REFINED_RADIANCE.asStack())); + recipes.add(ConversionRecipe.create(AllItems.CHROMATIC_COMPOUND.asStack(), AllItems.SHADOW_STEEL.asStack())); + recipes.add(ConversionRecipe.create(AllItems.CHROMATIC_COMPOUND.asStack(), AllItems.REFINED_RADIANCE.asStack())); return recipes; } public MysteriousItemConversionCategory() { - super("mystery_conversion", itemIcon(AllItemsNew.CHROMATIC_COMPOUND.get()), emptyBackground(177, 50)); + super("mystery_conversion", itemIcon(AllItems.CHROMATIC_COMPOUND.get()), emptyBackground(177, 50)); } @Override diff --git a/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java index cb08114be..3b3399f27 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/PolishingCategory.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.processing.ProcessingOutput; import com.simibubi.create.content.curiosities.tools.SandPaperPolishingRecipe; import com.simibubi.create.foundation.gui.AllGuiTextures; @@ -25,8 +25,8 @@ public class PolishingCategory extends CreateRecipeCategory { private AnimatedPress press = new AnimatedPress(false); public PressingCategory() { - super("pressing", doubleItemIcon(AllBlocks.MECHANICAL_PRESS.get(), AllItemsNew.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/SmokingViaFanCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/SmokingViaFanCategory.java index 11e307b77..5be594658 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/SmokingViaFanCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/SmokingViaFanCategory.java @@ -1,6 +1,6 @@ package com.simibubi.create.compat.jei.category; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.foundation.gui.GuiGameElement; import net.minecraft.block.Blocks; @@ -10,7 +10,7 @@ import net.minecraft.item.crafting.SmokingRecipe; public class SmokingViaFanCategory extends ProcessingViaFanCategory { public SmokingViaFanCategory() { - super("smoking_via_fan", doubleItemIcon(AllItemsNew.PROPELLER.get(), Items.BLAZE_POWDER)); + super("smoking_via_fan", doubleItemIcon(AllItems.PROPELLER.get(), Items.BLAZE_POWDER)); } @Override diff --git a/src/main/java/com/simibubi/create/compat/jei/category/SplashingCategory.java b/src/main/java/com/simibubi/create/compat/jei/category/SplashingCategory.java index 59c61d9f3..9fe2eb3c6 100644 --- a/src/main/java/com/simibubi/create/compat/jei/category/SplashingCategory.java +++ b/src/main/java/com/simibubi/create/compat/jei/category/SplashingCategory.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.components.fan.SplashingRecipe; import com.simibubi.create.content.contraptions.processing.ProcessingOutput; import com.simibubi.create.foundation.gui.AllGuiTextures; @@ -20,7 +20,7 @@ import net.minecraft.item.Items; public class SplashingCategory extends ProcessingViaFanCategory { public SplashingCategory() { - super("splashing", doubleItemIcon(AllItemsNew.PROPELLER.get(), Items.WATER_BUCKET)); + super("splashing", doubleItemIcon(AllItems.PROPELLER.get(), Items.WATER_BUCKET)); } @Override diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java index 0338e71bf..72a60c541 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java @@ -1,7 +1,7 @@ package com.simibubi.create.content.contraptions.components.crafter; import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock; import com.simibubi.create.content.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput; import com.simibubi.create.content.contraptions.components.crafter.MechanicalCrafterTileEntity.Phase; @@ -109,7 +109,7 @@ public class MechanicalCrafterBlock extends HorizontalKineticBlock implements IT MechanicalCrafterTileEntity crafter = CrafterHelper.getCrafter(worldIn, pos); if (crafter != null) { if (crafter.covered) - Block.spawnAsEntity(worldIn, pos, AllItemsNew.CRAFTER_SLOT_COVER.asStack()); + Block.spawnAsEntity(worldIn, pos, AllItems.CRAFTER_SLOT_COVER.asStack()); crafter.ejectWholeGrid(); } @@ -172,7 +172,7 @@ public class MechanicalCrafterBlock extends HorizontalKineticBlock implements IT if (!(te instanceof MechanicalCrafterTileEntity)) return ActionResultType.PASS; MechanicalCrafterTileEntity crafter = (MechanicalCrafterTileEntity) te; - boolean wrenched = AllItemsNew.typeOf(AllItemsNew.WRENCH, heldItem); + boolean wrenched = AllItems.typeOf(AllItems.WRENCH, heldItem); if (hit.getFace() == state.get(HORIZONTAL_FACING)) { @@ -185,7 +185,7 @@ public class MechanicalCrafterBlock extends HorizontalKineticBlock implements IT if (worldIn.isRemote) return ActionResultType.SUCCESS; - if (AllItemsNew.typeOf(AllItemsNew.CRAFTER_SLOT_COVER, heldItem)) { + if (AllItems.typeOf(AllItems.CRAFTER_SLOT_COVER, heldItem)) { if (crafter.covered) return ActionResultType.PASS; crafter.covered = true; @@ -216,7 +216,7 @@ public class MechanicalCrafterBlock extends HorizontalKineticBlock implements IT crafter.markDirty(); crafter.sendData(); if (!player.isCreative()) - player.inventory.placeItemBackInInventory(worldIn, AllItemsNew.CRAFTER_SLOT_COVER.asStack()); + player.inventory.placeItemBackInInventory(worldIn, AllItems.CRAFTER_SLOT_COVER.asStack()); return ActionResultType.SUCCESS; } return ActionResultType.PASS; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntity.java index e2e9ef13a..a1f9c8487 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterTileEntity.java @@ -9,7 +9,7 @@ import java.util.List; import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.AllTileEntities; import com.simibubi.create.content.contraptions.base.KineticTileEntity; import com.simibubi.create.content.contraptions.components.crafter.ConnectedInputHandler.ConnectedInput; @@ -98,7 +98,7 @@ public class MechanicalCrafterTileEntity extends KineticTileEntity { inserting = new InsertingBehaviour(this, Attachments.toward(this::getTargetFacing)); connectivity = new EdgeInteractionBehaviour(this, ConnectedInputHandler::toggleConnection) .connectivity(ConnectedInputHandler::shouldConnect) - .require(AllItemsNew.WRENCH.get()); + .require(AllItems.WRENCH.get()); behaviours.add(inserting); behaviours.add(connectivity); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java index 9f319cdde..c1604fda5 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.contraptions.components.deployer; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.AllShapes; import com.simibubi.create.content.contraptions.base.DirectionalAxisKineticBlock; import com.simibubi.create.content.contraptions.components.structureMovement.IPortableBlock; @@ -84,7 +84,7 @@ public class DeployerBlock extends DirectionalAxisKineticBlock implements ITE iterator = entries.keySet() .iterator(); iterator.hasNext();) { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/AbstractChassisBlock.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/AbstractChassisBlock.java index fa80408d8..b42e38fcc 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/AbstractChassisBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/AbstractChassisBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.contraptions.components.structureMovement.chassis; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.content.contraptions.wrench.IWrenchable; @@ -48,7 +48,7 @@ public abstract class AbstractChassisBlock extends RotatedPillarBlock implements ItemStack heldItem = player.getHeldItem(handIn); boolean isSlimeBall = heldItem.getItem() - .isIn(Tags.Items.SLIMEBALLS) || AllItemsNew.typeOf(AllItemsNew.SUPER_GLUE, heldItem); + .isIn(Tags.Items.SLIMEBALLS) || AllItems.typeOf(AllItems.SUPER_GLUE, heldItem); BooleanProperty affectedSide = getGlueableSide(state, hit.getFace()); if (affectedSide == null) diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java index ebdb6b6b6..56199fb23 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.Validate; import com.simibubi.create.AllEntityTypes; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.content.contraptions.components.structureMovement.BlockMovementTraits; import com.simibubi.create.content.schematics.ISpecialEntityItemRequirement; @@ -225,7 +225,7 @@ public class SuperGlueEntity extends Entity implements IEntityAdditionalSpawnDat @Override public ItemStack getPickedResult(RayTraceResult target) { - return AllItemsNew.SUPER_GLUE.asStack(); + return AllItems.SUPER_GLUE.asStack(); } @Override @@ -386,7 +386,7 @@ public class SuperGlueEntity extends Entity implements IEntityAdditionalSpawnDat @Override public ItemRequirement getRequiredItems() { - return new ItemRequirement(ItemUseType.DAMAGE, AllItemsNew.SUPER_GLUE.get()); + return new ItemRequirement(ItemUseType.DAMAGE, AllItems.SUPER_GLUE.get()); } } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java index 47b07ad32..46e6a13b1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueHandler.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.utility.worldWrappers.RayTraceWorld; @@ -63,7 +63,7 @@ public class SuperGlueHandler { public static void glueInOffHandAppliesOnBlockPlace(EntityPlaceEvent event, BlockPos pos, PlayerEntity placer) { ItemStack itemstack = placer.getHeldItemOffhand(); - if (!AllItemsNew.typeOf(AllItemsNew.SUPER_GLUE, itemstack)) + if (!AllItems.typeOf(AllItems.SUPER_GLUE, itemstack)) return; double distance = placer.getAttribute(PlayerEntity.REACH_DISTANCE) diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRenderer.java index eb32fd8cc..925e6ab0c 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueRenderer.java @@ -1,11 +1,11 @@ package com.simibubi.create.content.contraptions.components.structureMovement.glue; -import static com.simibubi.create.AllItemsNew.typeOf; +import static com.simibubi.create.AllItems.typeOf; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.matrix.MatrixStack.Entry; import com.mojang.blaze3d.vertex.IVertexBuilder; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.Create; import com.simibubi.create.foundation.utility.AngleHelper; import com.simibubi.create.foundation.utility.VecHelper; @@ -54,8 +54,8 @@ public class SuperGlueRenderer extends EntityRenderer { PlayerEntity player = Minecraft.getInstance().player; boolean visible = isVisible(entity); - boolean holdingGlue = typeOf(AllItemsNew.SUPER_GLUE, player.getHeldItemMainhand()) - || typeOf(AllItemsNew.SUPER_GLUE, player.getHeldItemOffhand()); + boolean holdingGlue = typeOf(AllItems.SUPER_GLUE, player.getHeldItemMainhand()) + || typeOf(AllItems.SUPER_GLUE, player.getHeldItemOffhand()); if (!visible && !holdingGlue) return; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java index 8a9af5bff..8845e0b33 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java @@ -4,7 +4,7 @@ import java.util.List; import javax.annotation.Nullable; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionEntity; @@ -185,7 +185,7 @@ public class MinecartContraptionItem extends Item { return; ItemStack wrench = player.getHeldItem(event.getHand()); - if (!AllItemsNew.typeOf(AllItemsNew.WRENCH, wrench)) + if (!AllItems.typeOf(AllItems.WRENCH, wrench)) return; if (entity instanceof ContraptionEntity) entity = entity.getRidingEntity(); @@ -212,7 +212,7 @@ public class MinecartContraptionItem extends Item { public static ItemStack create(Type type, ContraptionEntity entity) { ItemStack stack = - (type == Type.RIDEABLE ? AllItemsNew.MINECART_CONTRAPTION : AllItemsNew.FURNACE_MINECART_CONTRAPTION) + (type == Type.RIDEABLE ? AllItems.MINECART_CONTRAPTION : AllItems.FURNACE_MINECART_CONTRAPTION) .asStack(); CompoundNBT tag = entity.getContraption() .writeNBT(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java index 638de5236..71b705383 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.foundation.gui.GuiGameElement; import net.minecraft.client.Minecraft; @@ -51,7 +51,7 @@ public class GoggleOverlayRenderer { List tooltip = new ArrayList<>(); - if (goggleInformation && AllItemsNew.typeOf(AllItemsNew.GOGGLES, goggles)) { + if (goggleInformation && AllItems.typeOf(AllItems.GOGGLES, goggles)) { IHaveGoggleInformation gte = (IHaveGoggleInformation) te; if (!gte.addToGoggleTooltip(tooltip, mc.player.isSneaking())) goggleInformation = false; @@ -78,7 +78,7 @@ public class GoggleOverlayRenderer { tooltipScreen.init(mc, mc.getWindow().getScaledWidth(), mc.getWindow().getScaledHeight()); tooltipScreen.renderTooltip(tooltip, tooltipScreen.width / 2, tooltipScreen.height / 2); - ItemStack item = AllItemsNew.GOGGLES.asStack(); + ItemStack item = AllItems.GOGGLES.asStack(); GuiGameElement.of(item).at(tooltipScreen.width / 2 + 10, tooltipScreen.height / 2 - 16).render(); RenderSystem.popMatrix(); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesItem.java b/src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesItem.java index 55e953b57..f2d21064e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesItem.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.contraptions.goggles; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import net.minecraft.block.DispenserBlock; import net.minecraft.entity.MobEntity; @@ -41,7 +41,7 @@ public class GogglesItem extends Item { public static boolean canSeeParticles(PlayerEntity player) { for (ItemStack itemStack : player.getArmorInventoryList()) - if (AllItemsNew.typeOf(AllItemsNew.GOGGLES, itemStack)) + if (AllItems.typeOf(AllItems.GOGGLES, itemStack)) return true; return false; } diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java index bbd3f68ec..91980dfe3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/advanced/sequencer/SequencedGearshiftBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.contraptions.relays.advanced.sequencer; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.base.HorizontalAxisKineticBlock; import com.simibubi.create.content.contraptions.base.KineticBlock; import com.simibubi.create.content.contraptions.base.RotatedPillarKineticBlock; @@ -79,7 +79,7 @@ public class SequencedGearshiftBlock extends HorizontalAxisKineticBlock implemen public ActionResultType onUse(BlockState state, World worldIn, BlockPos pos, PlayerEntity player, Hand handIn, BlockRayTraceResult hit) { ItemStack held = player.getHeldItemMainhand(); - if (AllItemsNew.typeOf(AllItemsNew.WRENCH, held)) + if (AllItems.typeOf(AllItems.WRENCH, held)) return ActionResultType.PASS; if (held.getItem() instanceof BlockItem) { BlockItem blockItem = (BlockItem) held.getItem(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java index 357ba36ca..dd202a31a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java @@ -8,7 +8,7 @@ import java.util.List; import org.apache.commons.lang3.mutable.MutableInt; import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.base.HorizontalKineticBlock; import com.simibubi.create.content.contraptions.relays.belt.transport.BeltMovementHandler.TransportedEntityInfo; import com.simibubi.create.content.logistics.block.belts.tunnel.BeltTunnelBlock; @@ -82,7 +82,7 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE p_149666_2_) { - p_149666_2_.add(AllItemsNew.BELT_CONNECTOR.asStack()); + p_149666_2_.add(AllItems.BELT_CONNECTOR.asStack()); } @Override @@ -106,7 +106,7 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE items) { super.fillItemGroup(group, items); - items.add(AllItemsNew.VERTICAL_GEARBOX.asStack()); + items.add(AllItems.VERTICAL_GEARBOX.asStack()); } @SuppressWarnings("deprecation") @@ -49,7 +49,7 @@ public class GearboxBlock extends RotatedPillarKineticBlock { public List getDrops(BlockState state, Builder builder) { if (state.get(AXIS).isVertical()) return super.getDrops(state, builder); - return Arrays.asList(new ItemStack(AllItemsNew.VERTICAL_GEARBOX.get())); + return Arrays.asList(new ItemStack(AllItems.VERTICAL_GEARBOX.get())); } @Override @@ -57,7 +57,7 @@ public class GearboxBlock extends RotatedPillarKineticBlock { PlayerEntity player) { if (state.get(AXIS).isVertical()) return super.getPickBlock(state, target, world, pos, player); - return new ItemStack(AllItemsNew.VERTICAL_GEARBOX.get()); + return new ItemStack(AllItems.VERTICAL_GEARBOX.get()); } @Override diff --git a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java b/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java index c514eb685..ae5687f98 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/ChromaticCompoundItem.java @@ -3,7 +3,7 @@ package com.simibubi.create.content.curiosities; import java.util.List; import java.util.Random; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.foundation.advancement.AllTriggers; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.config.CCuriosities; @@ -89,7 +89,7 @@ public class ChromaticCompoundItem extends Item { // Convert to Shadow steel if in void if (y < 0 && y - yMotion < -10 && config.enableShadowSteelRecipe.get()) { - ItemStack newStack = AllItemsNew.SHADOW_STEEL.asStack(); + ItemStack newStack = AllItems.SHADOW_STEEL.asStack(); newStack.setCount(stack.getCount()); data.putBoolean("FromVoid", true); entity.setItem(newStack); @@ -100,7 +100,7 @@ public class ChromaticCompoundItem extends Item { // Convert to Refined Radiance if eaten enough light sources if (itemData.getInt("CollectingLight") >= config.lightSourceCountForRefinedRadiance.get()) { - ItemStack newStack = AllItemsNew.REFINED_RADIANCE.asStack(); + ItemStack newStack = AllItems.REFINED_RADIANCE.asStack(); ItemEntity newEntity = new ItemEntity(world, entity.getX(), entity.getY(), entity.getZ(), newStack); newEntity.setMotion(entity.getMotion()); newEntity.getPersistentData() @@ -135,7 +135,7 @@ public class ChromaticCompoundItem extends Item { } if (isOverBeacon) { - ItemStack newStack = AllItemsNew.REFINED_RADIANCE.asStack(); + ItemStack newStack = AllItems.REFINED_RADIANCE.asStack(); newStack.setCount(stack.getCount()); data.putBoolean("FromLight", true); entity.setItem(newStack); diff --git a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryHandler.java b/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryHandler.java index c01821adb..fe5a6f0ef 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryHandler.java +++ b/src/main/java/com/simibubi/create/content/curiosities/symmetry/SymmetryHandler.java @@ -1,12 +1,12 @@ package com.simibubi.create.content.curiosities.symmetry; -import static com.simibubi.create.AllItemsNew.typeOf; +import static com.simibubi.create.AllItems.typeOf; import java.util.Random; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.content.curiosities.symmetry.mirror.EmptyMirror; import com.simibubi.create.content.curiosities.symmetry.mirror.SymmetryMirror; import com.simibubi.create.foundation.utility.AnimationTickHolder; @@ -60,7 +60,7 @@ public class SymmetryHandler { if (!inv.getStackInSlot(i) .isEmpty() && inv.getStackInSlot(i) - .getItem() == AllItemsNew.WAND_OF_SYMMETRY.get()) { + .getItem() == AllItems.WAND_OF_SYMMETRY.get()) { SymmetryWandItem.apply(player.world, inv.getStackInSlot(i), player, event.getPos(), event.getPlacedBlock()); } @@ -77,7 +77,7 @@ public class SymmetryHandler { PlayerInventory inv = player.inventory; for (int i = 0; i < PlayerInventory.getHotbarSize(); i++) { if (!inv.getStackInSlot(i) - .isEmpty() && typeOf(AllItemsNew.WAND_OF_SYMMETRY, inv.getStackInSlot(i))) { + .isEmpty() && typeOf(AllItems.WAND_OF_SYMMETRY, inv.getStackInSlot(i))) { SymmetryWandItem.remove(player.world, inv.getStackInSlot(i), player, event.getPos()); } } @@ -91,7 +91,7 @@ public class SymmetryHandler { for (int i = 0; i < PlayerInventory.getHotbarSize(); i++) { ItemStack stackInSlot = player.inventory.getStackInSlot(i); - if (!typeOf(AllItemsNew.WAND_OF_SYMMETRY, stackInSlot)) + if (!typeOf(AllItems.WAND_OF_SYMMETRY, stackInSlot)) continue; if (!SymmetryWandItem.isEnabled(stackInSlot)) continue; @@ -155,7 +155,7 @@ public class SymmetryHandler { for (int i = 0; i < PlayerInventory.getHotbarSize(); i++) { ItemStack stackInSlot = player.inventory.getStackInSlot(i); - if (stackInSlot != null && typeOf(AllItemsNew.WAND_OF_SYMMETRY, stackInSlot) + if (stackInSlot != null && typeOf(AllItems.WAND_OF_SYMMETRY, stackInSlot) && SymmetryWandItem.isEnabled(stackInSlot)) { SymmetryMirror mirror = SymmetryWandItem.getMirror(stackInSlot); diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/AllToolTiers.java b/src/main/java/com/simibubi/create/content/curiosities/tools/AllToolTiers.java index 16065080b..22ba52060 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/AllToolTiers.java +++ b/src/main/java/com/simibubi/create/content/curiosities/tools/AllToolTiers.java @@ -2,7 +2,7 @@ package com.simibubi.create.content.curiosities.tools; import java.util.function.Supplier; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import net.minecraft.item.IItemTier; import net.minecraft.item.crafting.Ingredient; @@ -11,7 +11,7 @@ import net.minecraft.util.LazyValue; public enum AllToolTiers implements IItemTier { RADIANT(4, 1024, 16.0F, 3.5F, 10, () -> { - return Ingredient.fromItems(AllItemsNew.REFINED_RADIANCE.get()); + return Ingredient.fromItems(AllItems.REFINED_RADIANCE.get()); }), ; diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItem.java b/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItem.java index 7fe57fb14..3b95a6ca3 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/tools/DeforesterItem.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.curiosities.tools; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.TreeCutter; import com.simibubi.create.foundation.utility.TreeCutter.Tree; @@ -60,7 +60,7 @@ public class DeforesterItem extends AxeItem { @SubscribeEvent public static void onBlockDestroyed(BlockEvent.BreakEvent event) { ItemStack heldItemMainhand = event.getPlayer().getHeldItemMainhand(); - if (!AllItemsNew.typeOf(AllItemsNew.DEFORESTER, heldItemMainhand)) + if (!AllItems.typeOf(AllItems.DEFORESTER, heldItemMainhand)) return; destroyTree(heldItemMainhand, event.getWorld(), event.getState(), event.getPos(), event.getPlayer()); } diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java index 3f39ac7d1..e1d965454 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java @@ -5,7 +5,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.Create; import com.simibubi.create.content.curiosities.zapper.PlacementPatterns; import com.simibubi.create.content.curiosities.zapper.ZapperItem; @@ -151,7 +151,7 @@ public class BlockzapperItem extends ZapperItem { @Override public void inventoryTick(ItemStack stack, World worldIn, Entity entityIn, int itemSlot, boolean isSelected) { - if (AllItemsNew.typeOf(AllItemsNew.BLOCKZAPPER, stack)) { + if (AllItems.typeOf(AllItems.BLOCKZAPPER, stack)) { CompoundNBT nbt = stack.getOrCreateTag(); if (!nbt.contains("Replace")) nbt.putBoolean("Replace", false); diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperRenderHandler.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperRenderHandler.java index c0ed6ae27..3b46555ae 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperRenderHandler.java @@ -3,7 +3,7 @@ package com.simibubi.create.content.curiosities.zapper.blockzapper; import java.util.Collections; import java.util.List; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.AllSpecialTextures; import com.simibubi.create.CreateClient; @@ -33,8 +33,8 @@ public class BlockzapperRenderHandler { ClientPlayerEntity player = Minecraft.getInstance().player; ItemStack heldMain = player.getHeldItemMainhand(); ItemStack heldOff = player.getHeldItemOffhand(); - boolean zapperInMain = AllItemsNew.typeOf(AllItemsNew.BLOCKZAPPER, heldMain); - boolean zapperInOff = AllItemsNew.typeOf(AllItemsNew.BLOCKZAPPER, heldOff); + boolean zapperInMain = AllItems.typeOf(AllItems.BLOCKZAPPER, heldMain); + boolean zapperInOff = AllItems.typeOf(AllItems.BLOCKZAPPER, heldOff); if (zapperInMain) { CompoundNBT tag = heldMain.getOrCreateTag(); diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperUpgradeRecipe.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperUpgradeRecipe.java index c310557d2..59d88ca95 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperUpgradeRecipe.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperUpgradeRecipe.java @@ -1,7 +1,7 @@ package com.simibubi.create.content.curiosities.zapper.blockzapper; import com.google.gson.JsonObject; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.ComponentTier; import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.Components; @@ -45,7 +45,7 @@ public class BlockzapperUpgradeRecipe implements ICraftingRecipe { public ItemStack getCraftingResult(CraftingInventory inv) { for (int slot = 0; slot < inv.getSizeInventory(); slot++) { ItemStack handgun = inv.getStackInSlot(slot).copy(); - if (!AllItemsNew.typeOf(AllItemsNew.BLOCKZAPPER, handgun)) + if (!AllItems.typeOf(AllItems.BLOCKZAPPER, handgun)) continue; BlockzapperItem.setTier(getUpgradedComponent(), getTier(), handgun); return handgun; @@ -55,7 +55,7 @@ public class BlockzapperUpgradeRecipe implements ICraftingRecipe { @Override public ItemStack getRecipeOutput() { - ItemStack handgun = new ItemStack(AllItemsNew.BLOCKZAPPER.get()); + ItemStack handgun = new ItemStack(AllItems.BLOCKZAPPER.get()); BlockzapperItem.setTier(getUpgradedComponent(), getTier(), handgun); return handgun; } diff --git a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperRenderHandler.java b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperRenderHandler.java index df32f5c02..ab316b45c 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/curiosities/zapper/terrainzapper/WorldshaperRenderHandler.java @@ -3,7 +3,7 @@ package com.simibubi.create.content.curiosities.zapper.terrainzapper; import java.util.List; import java.util.stream.Collectors; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.AllSpecialTextures; import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.utility.NBTHelper; @@ -44,8 +44,8 @@ public class WorldshaperRenderHandler { ClientPlayerEntity player = Minecraft.getInstance().player; ItemStack heldMain = player.getHeldItemMainhand(); ItemStack heldOff = player.getHeldItemOffhand(); - boolean zapperInMain = AllItemsNew.typeOf(AllItemsNew.WORLDSHAPER, heldMain); - boolean zapperInOff = AllItemsNew.typeOf(AllItemsNew.WORLDSHAPER, heldOff); + boolean zapperInMain = AllItems.typeOf(AllItems.WORLDSHAPER, heldMain); + boolean zapperInOff = AllItems.typeOf(AllItems.WORLDSHAPER, heldOff); if (zapperInMain) { CompoundNBT tag = heldMain.getOrCreateTag(); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java index 5c8e81141..a1d803854 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/diodes/ToggleLatchBlock.java @@ -2,7 +2,7 @@ package com.simibubi.create.content.logistics.block.diodes; import java.util.Random; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -50,7 +50,7 @@ public class ToggleLatchBlock extends AbstractDiodeBlock { return ActionResultType.PASS; if (player.isSneaking()) return ActionResultType.PASS; - if (AllItemsNew.typeOf(AllItemsNew.WRENCH, player.getHeldItem(handIn))) + if (AllItems.typeOf(AllItems.WRENCH, player.getHeldItem(handIn))) return ActionResultType.PASS; return activated(worldIn, pos, state); } diff --git a/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchBlock.java index 0e3347035..89239a931 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/redstone/StockpileSwitchBlock.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.logistics.block.redstone; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.AllShapes; import com.simibubi.create.content.contraptions.wrench.IWrenchable; import com.simibubi.create.foundation.block.ITE; @@ -94,7 +94,7 @@ public class StockpileSwitchBlock extends HorizontalBlock implements ITE () -> withTileEntityDo(worldIn, pos, te -> this.displayScreen(te, player))); diff --git a/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterItem.java b/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterItem.java index 6a71a0c79..039109ff7 100644 --- a/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterItem.java +++ b/src/main/java/com/simibubi/create/content/logistics/item/filter/FilterItem.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.AllKeys; import com.simibubi.create.content.logistics.item.filter.AttributeFilterContainer.WhitelistMode; import com.simibubi.create.foundation.item.ItemDescription; @@ -159,7 +159,7 @@ public class FilterItem extends Item implements INamedContainerProvider { public static ItemStackHandler getFilterItems(ItemStack stack) { ItemStackHandler newInv = new ItemStackHandler(18); - if (AllItemsNew.FILTER.get() != stack.getItem()) + if (AllItems.FILTER.get() != stack.getItem()) throw new IllegalArgumentException("Cannot get filter items from non-filter: " + stack); CompoundNBT invNBT = stack.getOrCreateChildTag("Items"); if (!invNBT.isEmpty()) @@ -179,7 +179,7 @@ public class FilterItem extends Item implements INamedContainerProvider { return (matchNBT ? ItemHandlerHelper.canItemStacksStack(filter, stack) : ItemStack.areItemsEqual(filter, stack)); - if (AllItemsNew.FILTER.get() == filter.getItem()) { + if (AllItems.FILTER.get() == filter.getItem()) { ItemStackHandler filterItems = getFilterItems(filter); boolean respectNBT = filter.getOrCreateTag().getBoolean("RespectNBT"); boolean blacklist = filter.getOrCreateTag().getBoolean("Blacklist"); @@ -194,7 +194,7 @@ public class FilterItem extends Item implements INamedContainerProvider { return blacklist; } - if (AllItemsNew.ATTRIBUTE_FILTER.get() == filter.getItem()) { + if (AllItems.ATTRIBUTE_FILTER.get() == filter.getItem()) { WhitelistMode whitelistMode = WhitelistMode.values()[filter.getOrCreateTag().getInt("WhitelistMode")]; ListNBT attributes = filter.getOrCreateTag().getList("MatchedAttributes", NBT.TAG_COMPOUND); for (INBT inbt : attributes) { diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableContainer.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableContainer.java index 98e2a83d1..c68506b0a 100644 --- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableContainer.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicTableContainer.java @@ -1,9 +1,9 @@ package com.simibubi.create.content.schematics.block; -import static com.simibubi.create.AllItemsNew.typeOf; +import static com.simibubi.create.AllItems.typeOf; import com.simibubi.create.AllContainerTypes; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import net.minecraft.client.Minecraft; import net.minecraft.client.world.ClientWorld; @@ -46,9 +46,9 @@ public class SchematicTableContainer extends Container { inputSlot = new SlotItemHandler(te.inventory, 0, -9, 40) { @Override public boolean isItemValid(ItemStack stack) { - return typeOf(AllItemsNew.EMPTY_SCHEMATIC, stack) - || typeOf(AllItemsNew.SCHEMATIC_AND_QUILL, stack) - || typeOf(AllItemsNew.SCHEMATIC, stack); + return typeOf(AllItems.EMPTY_SCHEMATIC, stack) + || typeOf(AllItems.SCHEMATIC_AND_QUILL, stack) + || typeOf(AllItems.SCHEMATIC, stack); } }; diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonInventory.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonInventory.java index a8d422fc9..534924146 100644 --- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonInventory.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonInventory.java @@ -1,6 +1,6 @@ package com.simibubi.create.content.schematics.block; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -27,7 +27,7 @@ public class SchematicannonInventory extends ItemStackHandler { public boolean isItemValid(int slot, ItemStack stack) { switch (slot) { case 0: // Blueprint Slot - return AllItemsNew.typeOf(AllItemsNew.SCHEMATIC, stack); + return AllItems.typeOf(AllItems.SCHEMATIC, stack); case 1: // Blueprint output return false; case 2: // Book input diff --git a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java index d3ab120f3..4129b05b2 100644 --- a/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java +++ b/src/main/java/com/simibubi/create/content/schematics/block/SchematicannonTileEntity.java @@ -4,7 +4,7 @@ import java.util.LinkedList; import java.util.List; import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.AllTileEntities; import com.simibubi.create.content.contraptions.relays.belt.BeltBlock; @@ -541,7 +541,7 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC state = State.STOPPED; statusMsg = "schematicExpired"; inventory.setStackInSlot(0, ItemStack.EMPTY); - inventory.setStackInSlot(1, new ItemStack(AllItemsNew.EMPTY_SCHEMATIC.get())); + inventory.setStackInSlot(1, new ItemStack(AllItems.EMPTY_SCHEMATIC.get())); return; } @@ -678,7 +678,7 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC public void finishedPrinting() { inventory.setStackInSlot(0, ItemStack.EMPTY); - inventory.setStackInSlot(1, new ItemStack(AllItemsNew.EMPTY_SCHEMATIC.get(), inventory.getStackInSlot(1) + inventory.setStackInSlot(1, new ItemStack(AllItems.EMPTY_SCHEMATIC.get(), inventory.getStackInSlot(1) .getCount() + 1)); state = State.STOPPED; statusMsg = "finished"; @@ -828,7 +828,7 @@ public class SchematicannonTileEntity extends SmartTileEntity implements INamedC protected void launchBelt(BlockPos target, BlockState state, int length) { blocksPlaced++; - ItemStack connector = AllItemsNew.BELT_CONNECTOR.asStack(); + ItemStack connector = AllItems.BELT_CONNECTOR.asStack(); flyingBlocks.add(new LaunchedItem.ForBelt(this.getPos(), target, connector, state, length)); playFiringSound(); } diff --git a/src/main/java/com/simibubi/create/content/schematics/client/SchematicAndQuillHandler.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicAndQuillHandler.java index 436771937..e8fdbb981 100644 --- a/src/main/java/com/simibubi/create/content/schematics/client/SchematicAndQuillHandler.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicAndQuillHandler.java @@ -8,7 +8,7 @@ import java.nio.file.StandardOpenOption; import org.apache.commons.io.IOUtils; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.AllKeys; import com.simibubi.create.AllSpecialTextures; import com.simibubi.create.CreateClient; @@ -192,7 +192,7 @@ public class SchematicAndQuillHandler { } private boolean isActive() { - return isPresent() && AllItemsNew.typeOf(AllItemsNew.SCHEMATIC_AND_QUILL, + return isPresent() && AllItems.typeOf(AllItems.SCHEMATIC_AND_QUILL, Minecraft.getInstance().player.getHeldItemMainhand()); } diff --git a/src/main/java/com/simibubi/create/content/schematics/client/SchematicEditScreen.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicEditScreen.java index fc7fb2e5e..1f1c91ea4 100644 --- a/src/main/java/com/simibubi/create/content/schematics/client/SchematicEditScreen.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicEditScreen.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.List; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.gui.AbstractSimiScreen; import com.simibubi.create.foundation.gui.AllGuiTextures; @@ -141,7 +141,7 @@ public class SchematicEditScreen extends AbstractSimiScreen { RenderSystem.pushMatrix(); RenderSystem.translated(guiLeft + 220, guiTop + 20, 0); RenderSystem.scaled(3, 3, 3); - itemRenderer.renderItemIntoGUI(new ItemStack(AllItemsNew.SCHEMATIC.get()), 0, 0); + itemRenderer.renderItemIntoGUI(new ItemStack(AllItems.SCHEMATIC.get()), 0, 0); RenderSystem.popMatrix(); } diff --git a/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java index 1186355ba..1dabad81b 100644 --- a/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java @@ -4,7 +4,7 @@ import java.util.List; import com.google.common.collect.ImmutableList; import com.mojang.blaze3d.matrix.MatrixStack; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.AllKeys; import com.simibubi.create.content.schematics.SchematicWorld; import com.simibubi.create.content.schematics.client.tools.Tools; @@ -195,7 +195,7 @@ public class SchematicHandler { private ItemStack findBlueprintInHand(PlayerEntity player) { ItemStack stack = player.getHeldItemMainhand(); - if (!AllItemsNew.typeOf(AllItemsNew.SCHEMATIC, stack)) + if (!AllItems.typeOf(AllItems.SCHEMATIC, stack)) return null; if (!stack.hasTag()) return null; diff --git a/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java b/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java index a70ef90f2..fe8a15868 100644 --- a/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java +++ b/src/main/java/com/simibubi/create/content/schematics/item/SchematicItem.java @@ -9,7 +9,7 @@ import java.util.List; import org.apache.commons.io.IOUtils; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.content.schematics.client.SchematicEditScreen; import com.simibubi.create.foundation.gui.ScreenOpener; import com.simibubi.create.foundation.utility.Lang; @@ -48,7 +48,7 @@ public class SchematicItem extends Item { } public static ItemStack create(String schematic, String owner) { - ItemStack blueprint = AllItemsNew.SCHEMATIC.asStack(); + ItemStack blueprint = AllItems.SCHEMATIC.asStack(); CompoundNBT tag = new CompoundNBT(); tag.putBoolean("Deployed", false); diff --git a/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java b/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java index 1961e23ec..41d5ff39e 100644 --- a/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java +++ b/src/main/java/com/simibubi/create/foundation/advancement/AllAdvancements.java @@ -13,7 +13,7 @@ import com.google.common.collect.Sets; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.Create; import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem; import com.simibubi.create.content.curiosities.zapper.blockzapper.BlockzapperItem.ComponentTier; @@ -45,7 +45,7 @@ public class AllAdvancements implements IDataProvider { String id = Create.ID; Advancement root = Advancement.Builder.builder() - .withDisplay(AllItemsNew.BRASS_HAND.asStack(), new TranslationTextComponent(LANG + "root"), + .withDisplay(AllItems.BRASS_HAND.asStack(), new TranslationTextComponent(LANG + "root"), new TranslationTextComponent(LANG + "root.desc"), new ResourceLocation(Create.ID, "textures/block/palettes/gabbro/bricks.png"), FrameType.TASK, false, false, false) @@ -53,8 +53,8 @@ public class AllAdvancements implements IDataProvider { .register(t, id + ":root"); Advancement andesite_alloy = - advancement("andesite_alloy", AllItemsNew.ANDESITE_ALLOY.get(), TaskType.NORMAL).withParent(root) - .withCriterion("0", itemGathered(AllItemsNew.ANDESITE_ALLOY.get())) + advancement("andesite_alloy", AllItems.ANDESITE_ALLOY.get(), TaskType.NORMAL).withParent(root) + .withCriterion("0", itemGathered(AllItems.ANDESITE_ALLOY.get())) .register(t, id + ":andesite_alloy"); kineticsBranch(t, andesite_alloy); @@ -90,12 +90,12 @@ public class AllAdvancements implements IDataProvider { .register(t, id + ":press"); Advancement rose_quartz = - itemAdvancement("polished_rose_quartz", AllItemsNew.POLISHED_ROSE_QUARTZ, TaskType.NORMAL) + itemAdvancement("polished_rose_quartz", AllItems.POLISHED_ROSE_QUARTZ, TaskType.NORMAL) .withParent(andesite_casing) .register(t, id + ":polished_rose_quartz"); Advancement electron_tube = - itemAdvancement("electron_tube", AllItemsNew.ELECTRON_TUBE, TaskType.NORMAL).withParent(rose_quartz) + itemAdvancement("electron_tube", AllItems.ELECTRON_TUBE, TaskType.NORMAL).withParent(rose_quartz) .register(t, id + ":electron_tube"); Advancement saw = kinecticAdvancement("saw", AllBlocks.SAW.get(), TaskType.NORMAL).withParent(press) @@ -118,7 +118,7 @@ public class AllAdvancements implements IDataProvider { .withParent(basin) .register(t, id + ":compact"); - Advancement brass = itemAdvancement("brass", AllItemsNew.BRASS_INGOT, TaskType.NORMAL).withParent(mixer) + Advancement brass = itemAdvancement("brass", AllItems.BRASS_INGOT, TaskType.NORMAL).withParent(mixer) .register(t, id + ":brass"); brassAge(t, brass); @@ -132,14 +132,14 @@ public class AllAdvancements implements IDataProvider { .withCriterion("0", AllTriggers.ROTATION.instance()) .register(t, id + ":its_alive"); - Advancement belt = advancement("belt", AllItemsNew.BELT_CONNECTOR.get(), TaskType.NORMAL).withParent(its_alive) + Advancement belt = advancement("belt", AllItems.BELT_CONNECTOR.get(), TaskType.NORMAL).withParent(its_alive) .withCriterion("0", AllTriggers.CONNECT_BELT.instance()) .register(t, id + ":belt"); - Advancement wrench = itemAdvancement("wrench", AllItemsNew.WRENCH, TaskType.NORMAL).withParent(its_alive) + Advancement wrench = itemAdvancement("wrench", AllItems.WRENCH, TaskType.NORMAL).withParent(its_alive) .register(t, id + ":wrench"); - Advancement goggles = itemAdvancement("goggles", AllItemsNew.GOGGLES, TaskType.NORMAL).withParent(its_alive) + Advancement goggles = itemAdvancement("goggles", AllItems.GOGGLES, TaskType.NORMAL).withParent(its_alive) .register(t, id + ":goggles"); Advancement speed_gauge = @@ -200,27 +200,27 @@ public class AllAdvancements implements IDataProvider { .register(t, id + ":crushing_wheel"); Advancement chromatic_compound = - itemAdvancement("chromatic_compound", AllItemsNew.CHROMATIC_COMPOUND, TaskType.NORMAL) + itemAdvancement("chromatic_compound", AllItems.CHROMATIC_COMPOUND, TaskType.NORMAL) .withParent(crushing_wheel) .register(t, id + ":chromatic_compound"); Advancement shadow_steel = - itemAdvancement("shadow_steel", AllItemsNew.SHADOW_STEEL, TaskType.GOAL).withParent(chromatic_compound) + itemAdvancement("shadow_steel", AllItems.SHADOW_STEEL, TaskType.GOAL).withParent(chromatic_compound) .register(t, id + ":shadow_steel"); - Advancement refined_radiance = itemAdvancement("refined_radiance", AllItemsNew.REFINED_RADIANCE, TaskType.GOAL) + Advancement refined_radiance = itemAdvancement("refined_radiance", AllItems.REFINED_RADIANCE, TaskType.GOAL) .withParent(chromatic_compound) .register(t, id + ":refined_radiance"); Advancement deforester = - itemAdvancement("deforester", AllItemsNew.DEFORESTER, TaskType.NORMAL).withParent(refined_radiance) + itemAdvancement("deforester", AllItems.DEFORESTER, TaskType.NORMAL).withParent(refined_radiance) .register(t, id + ":deforester"); Advancement zapper = - itemAdvancement("zapper", AllItemsNew.BLOCKZAPPER, TaskType.NORMAL).withParent(refined_radiance) + itemAdvancement("zapper", AllItems.BLOCKZAPPER, TaskType.NORMAL).withParent(refined_radiance) .register(t, id + ":zapper"); - ItemStack gunWithPurpurStuff = AllItemsNew.BLOCKZAPPER.asStack(); + ItemStack gunWithPurpurStuff = AllItems.BLOCKZAPPER.asStack(); for (Components c : Components.values()) BlockzapperItem.setTier(c, ComponentTier.Chromatic, gunWithPurpurStuff); Advancement upgraded_zapper = advancement("upgraded_zapper", gunWithPurpurStuff, TaskType.CHALLENGE) @@ -229,11 +229,11 @@ public class AllAdvancements implements IDataProvider { .register(t, id + ":upgraded_zapper"); Advancement symmetry_wand = - itemAdvancement("symmetry_wand", AllItemsNew.WAND_OF_SYMMETRY, TaskType.NORMAL).withParent(refined_radiance) + itemAdvancement("symmetry_wand", AllItems.WAND_OF_SYMMETRY, TaskType.NORMAL).withParent(refined_radiance) .register(t, id + ":symmetry_wand"); Advancement shadow_end = deadEnd().withParent(shadow_steel) - .withCriterion("0", itemGathered(AllItemsNew.SHADOW_STEEL.get())) + .withCriterion("0", itemGathered(AllItems.SHADOW_STEEL.get())) .register(t, id + ":shadow_end"); } diff --git a/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java b/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java index e057677ab..c93f6d243 100644 --- a/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java +++ b/src/main/java/com/simibubi/create/foundation/item/ItemDescription.java @@ -21,7 +21,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.content.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.base.IRotate.SpeedLevel; import com.simibubi.create.content.contraptions.base.IRotate.StressImpact; @@ -101,7 +101,7 @@ public class ItemDescription { .get() > 0 && StressImpact.isEnabled(); boolean hasStressCapacity = capacities.containsKey(id) && StressImpact.isEnabled(); boolean hasGlasses = - AllItemsNew.GOGGLES.get() == Minecraft.getInstance().player.getItemStackFromSlot(EquipmentSlotType.HEAD) + AllItems.GOGGLES.get() == Minecraft.getInstance().player.getItemStackFromSlot(EquipmentSlotType.HEAD) .getItem(); String rpmUnit = Lang.translate("generic.unit.rpm"); diff --git a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java index c371e0578..847b7658b 100644 --- a/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java +++ b/src/main/java/com/simibubi/create/foundation/item/TooltipHelper.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; import com.mojang.bridge.game.Language; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.content.AllSections; import com.simibubi.create.content.contraptions.base.IRotate; import com.simibubi.create.content.contraptions.components.flywheel.engine.EngineBlock; @@ -97,7 +97,7 @@ public class TooltipHelper { ClientPlayerEntity player = Minecraft.getInstance().player; boolean hasGlasses = player != null - && AllItemsNew.typeOf(AllItemsNew.GOGGLES, player.getItemStackFromSlot(EquipmentSlotType.HEAD)); + && AllItems.typeOf(AllItems.GOGGLES, player.getItemStackFromSlot(EquipmentSlotType.HEAD)); if (hasGlasses != gogglesMode) { gogglesMode = hasGlasses; diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueHandler.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueHandler.java index fc7477e7d..b2313035d 100644 --- a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueHandler.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueHandler.java @@ -1,6 +1,6 @@ package com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.AllKeys; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour; @@ -36,7 +36,7 @@ public class ScrollValueHandler { return false; if (!mc.player.isAllowEdit()) return false; - if (scrolling.needsWrench && !AllItemsNew.typeOf(AllItemsNew.WRENCH, mc.player.getHeldItemMainhand())) + if (scrolling.needsWrench && !AllItems.typeOf(AllItems.WRENCH, mc.player.getHeldItemMainhand())) return false; if (scrolling.slotPositioning instanceof Sided) ((Sided) scrolling.slotPositioning).fromSide(result.getFace()); diff --git a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueRenderer.java b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueRenderer.java index 598c84621..da8e9b33f 100644 --- a/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/tileEntity/behaviour/scrollvalue/ScrollValueRenderer.java @@ -1,6 +1,6 @@ package com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue; -import com.simibubi.create.AllItemsNew; +import com.simibubi.create.AllItems; import com.simibubi.create.AllKeys; import com.simibubi.create.CreateClient; import com.simibubi.create.foundation.tileEntity.SmartTileEntity; @@ -36,7 +36,7 @@ public class ScrollValueRenderer { if (behaviour == null) return; if (behaviour.needsWrench - && !AllItemsNew.typeOf(AllItemsNew.WRENCH, Minecraft.getInstance().player.getHeldItemMainhand())) + && !AllItems.typeOf(AllItems.WRENCH, Minecraft.getInstance().player.getHeldItemMainhand())) return; boolean highlight = behaviour.testHit(target.getHitVec());