diff --git a/src/additions/java/mekanism/additions/common/item/ItemBalloon.java b/src/additions/java/mekanism/additions/common/item/ItemBalloon.java index a5160a9b0c0..d681e35e056 100644 --- a/src/additions/java/mekanism/additions/common/item/ItemBalloon.java +++ b/src/additions/java/mekanism/additions/common/item/ItemBalloon.java @@ -5,7 +5,6 @@ import mekanism.api.text.EnumColor; import mekanism.api.text.TextComponentUtil; import mekanism.common.lib.math.Pos3D; -import mekanism.common.registration.impl.ItemDeferredRegister; import mekanism.common.util.WorldUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.BlockSource; @@ -33,7 +32,7 @@ public class ItemBalloon extends Item { private final EnumColor color; public ItemBalloon(EnumColor color) { - super(ItemDeferredRegister.getMekBaseProperties()); + super(new Item.Properties()); this.color = color; DispenserBlock.registerBehavior(this, new DispenserBehavior(this.color)); } diff --git a/src/main/java/mekanism/client/render/obj/TransmitterBakedModel.java b/src/main/java/mekanism/client/render/obj/TransmitterBakedModel.java index beac61ee3f3..64cdfdd5b83 100644 --- a/src/main/java/mekanism/client/render/obj/TransmitterBakedModel.java +++ b/src/main/java/mekanism/client/render/obj/TransmitterBakedModel.java @@ -157,7 +157,6 @@ public List load(@NotNull SidedConnection key) { //If the part should be rotated, then we need to use a custom IModelTransform Vector3f vecForDirection = Vec3.atLowerCornerOf(side.getNormal()).toVector3f(); vecForDirection.mul(-1); - //TODO - 1.20: Test this Quaternionf quaternion = new Quaternionf().setAngleAxis(iconStatus.getAngle(), vecForDirection.x, vecForDirection.y, vecForDirection.z); Transformation matrix = new Transformation(null, quaternion, null, null); transform = new SimpleModelState(transform.getRotation().compose(matrix), transform.isUvLocked()); diff --git a/src/main/java/mekanism/common/item/block/ItemBlockBin.java b/src/main/java/mekanism/common/item/block/ItemBlockBin.java index 2524991137b..69ddd0ffdf4 100644 --- a/src/main/java/mekanism/common/item/block/ItemBlockBin.java +++ b/src/main/java/mekanism/common/item/block/ItemBlockBin.java @@ -8,10 +8,10 @@ import mekanism.common.inventory.BinMekanismInventory; import mekanism.common.inventory.slot.BinInventorySlot; import mekanism.common.item.interfaces.IItemSustainedInventory; -import mekanism.common.registration.impl.ItemDeferredRegister; import mekanism.common.tier.BinTier; import mekanism.common.util.text.TextUtils; import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; @@ -20,7 +20,7 @@ public class ItemBlockBin extends ItemBlockTooltip implements IItemSustainedInventory { public ItemBlockBin(BlockBin block) { - super(block, ItemDeferredRegister.getMekBaseProperties().stacksTo(1)); + super(block, new Item.Properties().stacksTo(1)); } @Override diff --git a/src/main/java/mekanism/common/item/block/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/block/ItemBlockCardboardBox.java index 31ed0b6d648..e539ee51343 100644 --- a/src/main/java/mekanism/common/item/block/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/block/ItemBlockCardboardBox.java @@ -10,7 +10,6 @@ import mekanism.common.block.BlockCardboardBox.BlockData; import mekanism.common.block.states.BlockStateHelper; import mekanism.common.config.MekanismConfig; -import mekanism.common.registration.impl.ItemDeferredRegister; import mekanism.common.tags.MekanismTags; import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.util.ItemDataUtils; @@ -24,6 +23,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.BlockPlaceContext; @@ -39,7 +39,7 @@ public class ItemBlockCardboardBox extends ItemBlockMekanism { public ItemBlockCardboardBox(BlockCardboardBox block) { - super(block, ItemDeferredRegister.getMekBaseProperties().stacksTo(16)); + super(block, new Item.Properties().stacksTo(16)); } @Override diff --git a/src/main/java/mekanism/common/item/block/ItemBlockColoredName.java b/src/main/java/mekanism/common/item/block/ItemBlockColoredName.java index 30879491738..838e859e014 100644 --- a/src/main/java/mekanism/common/item/block/ItemBlockColoredName.java +++ b/src/main/java/mekanism/common/item/block/ItemBlockColoredName.java @@ -3,7 +3,6 @@ import mekanism.api.text.EnumColor; import mekanism.api.text.TextComponentUtil; import mekanism.common.block.interfaces.IColoredBlock; -import mekanism.common.registration.impl.ItemDeferredRegister; import net.minecraft.network.chat.Component; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; @@ -15,7 +14,7 @@ public class ItemBlockColoredName extends BlockItem { public ItemBlockColoredName(BLOCK block) { - this(block, ItemDeferredRegister.getMekBaseProperties()); + this(block, new Item.Properties()); } public ItemBlockColoredName(BLOCK block, Item.Properties properties) { diff --git a/src/main/java/mekanism/common/item/block/ItemBlockInductionCell.java b/src/main/java/mekanism/common/item/block/ItemBlockInductionCell.java index 3fcef9eee05..af36ce88885 100644 --- a/src/main/java/mekanism/common/item/block/ItemBlockInductionCell.java +++ b/src/main/java/mekanism/common/item/block/ItemBlockInductionCell.java @@ -6,12 +6,12 @@ import mekanism.common.block.attribute.Attribute; import mekanism.common.block.prefab.BlockTile; import mekanism.common.content.blocktype.BlockTypeTile; -import mekanism.common.registration.impl.ItemDeferredRegister; import mekanism.common.tier.InductionCellTier; import mekanism.common.tile.multiblock.TileEntityInductionCell; import mekanism.common.util.StorageUtils; import mekanism.common.util.text.EnergyDisplay; import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; @@ -20,7 +20,7 @@ public class ItemBlockInductionCell extends ItemBlockTooltip>> { public ItemBlockInductionCell(BlockTile> block) { - super(block, ItemDeferredRegister.getMekBaseProperties()); + super(block, new Item.Properties()); } @NotNull diff --git a/src/main/java/mekanism/common/item/block/ItemBlockInductionProvider.java b/src/main/java/mekanism/common/item/block/ItemBlockInductionProvider.java index 763a8c42b72..3bdf7946e8f 100644 --- a/src/main/java/mekanism/common/item/block/ItemBlockInductionProvider.java +++ b/src/main/java/mekanism/common/item/block/ItemBlockInductionProvider.java @@ -6,11 +6,11 @@ import mekanism.common.block.attribute.Attribute; import mekanism.common.block.prefab.BlockTile; import mekanism.common.content.blocktype.BlockTypeTile; -import mekanism.common.registration.impl.ItemDeferredRegister; import mekanism.common.tier.InductionProviderTier; import mekanism.common.tile.multiblock.TileEntityInductionProvider; import mekanism.common.util.text.EnergyDisplay; import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; @@ -19,7 +19,7 @@ public class ItemBlockInductionProvider extends ItemBlockTooltip>> { public ItemBlockInductionProvider(BlockTile> block) { - super(block, ItemDeferredRegister.getMekBaseProperties()); + super(block, new Item.Properties()); } @Override diff --git a/src/main/java/mekanism/common/item/block/ItemBlockMultipartAble.java b/src/main/java/mekanism/common/item/block/ItemBlockMultipartAble.java index 0136341f591..73f620a04db 100644 --- a/src/main/java/mekanism/common/item/block/ItemBlockMultipartAble.java +++ b/src/main/java/mekanism/common/item/block/ItemBlockMultipartAble.java @@ -1,11 +1,11 @@ package mekanism.common.item.block; -import mekanism.common.registration.impl.ItemDeferredRegister; import mekanism.common.util.WorldUtils; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.item.context.UseOnContext; @@ -22,7 +22,7 @@ public abstract class ItemBlockMultipartAble extends ItemBlockMekanism { public ItemBlockMultipartAble(BLOCK block) { - super(block, ItemDeferredRegister.getMekBaseProperties()); + super(block, new Item.Properties()); } /** diff --git a/src/main/java/mekanism/common/item/block/ItemBlockTooltip.java b/src/main/java/mekanism/common/item/block/ItemBlockTooltip.java index a4231d9f7e9..64ab1dc40b8 100644 --- a/src/main/java/mekanism/common/item/block/ItemBlockTooltip.java +++ b/src/main/java/mekanism/common/item/block/ItemBlockTooltip.java @@ -12,7 +12,6 @@ import mekanism.common.block.attribute.Attributes.AttributeInventory; import mekanism.common.block.interfaces.IHasDescription; import mekanism.common.item.interfaces.IItemSustainedInventory; -import mekanism.common.registration.impl.ItemDeferredRegister; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.StorageUtils; @@ -41,7 +40,7 @@ public ItemBlockTooltip(BLOCK block, Item.Properties properties) { } public ItemBlockTooltip(BLOCK block) { - this(block, true, ItemDeferredRegister.getMekBaseProperties().stacksTo(1)); + this(block, true, new Item.Properties().stacksTo(1)); } protected ItemBlockTooltip(BLOCK block, boolean hasDetails, Properties properties) { diff --git a/src/main/java/mekanism/common/registration/impl/BlockDeferredRegister.java b/src/main/java/mekanism/common/registration/impl/BlockDeferredRegister.java index 0777387413d..c5f7e2dcfb9 100644 --- a/src/main/java/mekanism/common/registration/impl/BlockDeferredRegister.java +++ b/src/main/java/mekanism/common/registration/impl/BlockDeferredRegister.java @@ -33,7 +33,7 @@ public BlockRegistryObject register(Stri public BlockRegistryObject registerDefaultProperties(String name, Supplier blockSupplier, BiFunction itemCreator) { - return register(name, blockSupplier, block -> itemCreator.apply(block, ItemDeferredRegister.getMekBaseProperties())); + return register(name, blockSupplier, block -> itemCreator.apply(block, new Item.Properties())); } public BlockRegistryObject register(String name, Supplier blockSupplier, diff --git a/src/main/java/mekanism/common/registration/impl/CreativeTabDeferredRegister.java b/src/main/java/mekanism/common/registration/impl/CreativeTabDeferredRegister.java index 0e0170eedf4..645b40d59c8 100644 --- a/src/main/java/mekanism/common/registration/impl/CreativeTabDeferredRegister.java +++ b/src/main/java/mekanism/common/registration/impl/CreativeTabDeferredRegister.java @@ -1,8 +1,10 @@ package mekanism.common.registration.impl; import java.util.function.UnaryOperator; +import mekanism.api.providers.IBlockProvider; import mekanism.api.providers.IItemProvider; import mekanism.api.text.ILangEntry; +import mekanism.common.block.BlockBounding; import mekanism.common.registration.WrappedDeferredRegister; import net.minecraft.core.registries.Registries; import net.minecraft.world.item.CreativeModeTab; @@ -60,8 +62,11 @@ public static void addToDisplay(ItemDeferredRegister register, CreativeModeTab.O } public static void addToDisplay(BlockDeferredRegister register, CreativeModeTab.Output output) { - for (IItemProvider itemProvider : register.getAllBlocks()) { - addToDisplay(itemProvider, output); + for (IBlockProvider itemProvider : register.getAllBlocks()) { + //Don't add bounding blocks to the creative tab + if (!(itemProvider.getBlock() instanceof BlockBounding)) { + addToDisplay(itemProvider, output); + } } } @@ -74,8 +79,7 @@ public static void addToDisplay(FluidDeferredRegister register, CreativeModeTab. //TODO - 1.20: Re-evaluate this and maybe inline the stuff into their respective creative tabs public interface ICustomCreativeTabContents { - default void addItems(CreativeModeTab.Output tabOutput) { - } + void addItems(CreativeModeTab.Output tabOutput); default boolean addDefault() { return true; diff --git a/src/main/java/mekanism/common/registration/impl/FluidDeferredRegister.java b/src/main/java/mekanism/common/registration/impl/FluidDeferredRegister.java index effe45e0bf3..0131b94dc0d 100644 --- a/src/main/java/mekanism/common/registration/impl/FluidDeferredRegister.java +++ b/src/main/java/mekanism/common/registration/impl/FluidDeferredRegister.java @@ -132,7 +132,7 @@ public FluidRegistry fluidRegistryObject.updateStill(fluidRegister.register(name, () -> new Source(fluidProperties))); fluidRegistryObject.updateFlowing(fluidRegister.register(flowingName, () -> new Flowing(fluidProperties))); fluidRegistryObject.updateBucket(itemRegister.register(bucketName, () -> bucketCreator.create(fluidRegistryObject::getStillFluid, - ItemDeferredRegister.getMekBaseProperties().stacksTo(1).craftRemainder(Items.BUCKET)))); + new Item.Properties().stacksTo(1).craftRemainder(Items.BUCKET)))); //Note: The block properties used here is a copy of the ones for water fluidRegistryObject.updateBlock(blockRegister.register(name, () -> new LiquidBlock(fluidRegistryObject::getStillFluid, BlockBehaviour.Properties.of() .noCollission().strength(100.0F).noLootTable().replaceable().pushReaction(PushReaction.DESTROY).liquid().mapColor(MapColor.WATER)))); diff --git a/src/main/java/mekanism/common/registration/impl/ItemDeferredRegister.java b/src/main/java/mekanism/common/registration/impl/ItemDeferredRegister.java index 049e9f34cdd..e9fc3c11d66 100644 --- a/src/main/java/mekanism/common/registration/impl/ItemDeferredRegister.java +++ b/src/main/java/mekanism/common/registration/impl/ItemDeferredRegister.java @@ -28,12 +28,6 @@ public ItemDeferredRegister(String modid) { super(modid, ForgeRegistries.ITEMS); } - public static Item.Properties getMekBaseProperties() { - //TODO - 1.20: Do we want to inline the creation as we now have no other base properties? - //TODO - 1.20: Ensure everything actually ends up in a creative tab - return new Item.Properties(); - } - public ItemRegistryObject register(String name) { return register(name, Item::new); } @@ -59,15 +53,15 @@ public Component getName(@NotNull ItemStack stack) { public ItemRegistryObject registerModule(ModuleRegistryObject moduleDataSupplier) { //Note: We use the internal helper just in case we end up needing to know it is an ItemModule instead of just an Item somewhere return register("module_" + moduleDataSupplier.getInternalRegistryName(), - () -> ModuleHelper.INSTANCE.createModuleItem(moduleDataSupplier, getMekBaseProperties())); + () -> ModuleHelper.INSTANCE.createModuleItem(moduleDataSupplier, new Item.Properties())); } public ItemRegistryObject register(String name, Function sup) { - return register(name, () -> sup.apply(getMekBaseProperties())); + return register(name, () -> sup.apply(new Item.Properties())); } public ItemRegistryObject registerUnburnable(String name, Function sup) { - return register(name, () -> sup.apply(getMekBaseProperties().fireResistant())); + return register(name, () -> sup.apply(new Item.Properties().fireResistant())); } public ItemRegistryObject register(String name, Supplier sup) { diff --git a/src/main/java/mekanism/common/registries/MekanismBlocks.java b/src/main/java/mekanism/common/registries/MekanismBlocks.java index e905d503040..661633de26a 100644 --- a/src/main/java/mekanism/common/registries/MekanismBlocks.java +++ b/src/main/java/mekanism/common/registries/MekanismBlocks.java @@ -154,7 +154,6 @@ import mekanism.common.util.EnumUtils; import net.minecraft.stats.Stats; import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.Item; import net.minecraft.world.item.Rarity; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; @@ -337,7 +336,7 @@ private MekanismBlocks() { public static final BlockRegistryObject ELITE_THERMODYNAMIC_CONDUCTOR = registerThermodynamicConductor(ConductorTier.ELITE); public static final BlockRegistryObject ULTIMATE_THERMODYNAMIC_CONDUCTOR = registerThermodynamicConductor(ConductorTier.ULTIMATE); - public static final BlockRegistryObject BOUNDING_BLOCK = registerBoundingBlock("bounding_block", BlockBounding::new); + public static final BlockRegistryObject BOUNDING_BLOCK = BLOCKS.register("bounding_block", BlockBounding::new); public static final BlockRegistryObject>, ItemBlockChemicalTank> BASIC_CHEMICAL_TANK = registerChemicalTank(MekanismBlockTypes.BASIC_CHEMICAL_TANK); public static final BlockRegistryObject>, ItemBlockChemicalTank> ADVANCED_CHEMICAL_TANK = registerChemicalTank(MekanismBlockTypes.ADVANCED_CHEMICAL_TANK); @@ -348,10 +347,6 @@ private MekanismBlocks() { public static final BlockRegistryObject CARDBOARD_BOX = BLOCKS.register("cardboard_box", BlockCardboardBox::new, ItemBlockCardboardBox::new); public static final BlockRegistryObject SALT_BLOCK = BLOCKS.register("block_salt", BlockBehaviour.Properties.of().strength(0.5F).sound(SoundType.SAND).instrument(NoteBlockInstrument.SNARE)); - private static BlockRegistryObject registerBoundingBlock(String name, Supplier blockSupplier) { - return BLOCKS.register(name, blockSupplier, block -> new BlockItem(block, new Item.Properties())); - } - private static BlockRegistryObject registerResourceBlock(BlockResourceInfo resource) { return BLOCKS.registerDefaultProperties("block_" + resource.getRegistrySuffix(), () -> new BlockResource(resource), (block, properties) -> { if (!block.getResourceInfo().burnsInFire()) { diff --git a/src/main/java/mekanism/common/registries/MekanismCreativeTabs.java b/src/main/java/mekanism/common/registries/MekanismCreativeTabs.java index c9cf8ccb07e..eb67c2ab095 100644 --- a/src/main/java/mekanism/common/registries/MekanismCreativeTabs.java +++ b/src/main/java/mekanism/common/registries/MekanismCreativeTabs.java @@ -24,7 +24,6 @@ public class MekanismCreativeTabs { public static final CreativeTabRegistryObject MEKANISM = CREATIVE_TABS.registerMain(MekanismLang.MEKANISM, MekanismItems.ATOMIC_ALLOY, builder -> builder.withSearchBar()//Allow our tabs to be searchable for convenience purposes .displayItems((displayParameters, output) -> { - //TODO - 1.20: Add other module's items unless we decide to split up into multiple tabs which might be time to do so CreativeTabDeferredRegister.addToDisplay(MekanismItems.ITEMS, output); CreativeTabDeferredRegister.addToDisplay(MekanismBlocks.BLOCKS, output); CreativeTabDeferredRegister.addToDisplay(MekanismFluids.FLUIDS, output); diff --git a/src/main/java/mekanism/common/registries/MekanismItems.java b/src/main/java/mekanism/common/registries/MekanismItems.java index 50d42c4f495..4dce756106e 100644 --- a/src/main/java/mekanism/common/registries/MekanismItems.java +++ b/src/main/java/mekanism/common/registries/MekanismItems.java @@ -66,7 +66,7 @@ private MekanismItems() { public static final Table> PROCESSED_RESOURCES = HashBasedTable.create(); public static final ItemRegistryObject ROBIT = ITEMS.register("robit", ItemRobit::new); - public static final ItemRegistryObject ENERGY_TABLET = ITEMS.register("energy_tablet", () -> new ItemEnergized(MekanismConfig.gear.tabletChargeRate, MekanismConfig.gear.tabletMaxEnergy, BasicEnergyContainer.alwaysTrue, BasicEnergyContainer.alwaysTrue, ItemDeferredRegister.getMekBaseProperties().rarity(Rarity.UNCOMMON))); + public static final ItemRegistryObject ENERGY_TABLET = ITEMS.register("energy_tablet", () -> new ItemEnergized(MekanismConfig.gear.tabletChargeRate, MekanismConfig.gear.tabletMaxEnergy, BasicEnergyContainer.alwaysTrue, BasicEnergyContainer.alwaysTrue, new Item.Properties().rarity(Rarity.UNCOMMON))); public static final ItemRegistryObject CONFIGURATOR = ITEMS.register("configurator", ItemConfigurator::new); public static final ItemRegistryObject NETWORK_READER = ITEMS.register("network_reader", ItemNetworkReader::new); public static final ItemRegistryObject DICTIONARY = ITEMS.register("dictionary", ItemDictionary::new); diff --git a/src/tools/java/mekanism/tools/common/registries/ToolsItems.java b/src/tools/java/mekanism/tools/common/registries/ToolsItems.java index 672529a402f..f01087e35ed 100644 --- a/src/tools/java/mekanism/tools/common/registries/ToolsItems.java +++ b/src/tools/java/mekanism/tools/common/registries/ToolsItems.java @@ -156,7 +156,7 @@ private static ItemRegistryObject register(BiFunction< } private static Item.Properties getBaseProperties(BaseMekanismMaterial material) { - Item.Properties properties = ItemDeferredRegister.getMekBaseProperties(); + Item.Properties properties = new Item.Properties(); if (!material.burnsInFire()) { properties = properties.fireResistant(); }