diff --git a/gradle.properties b/gradle.properties index 8761f58d..977674a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.daemon=false minecraft_version=1.20.1 minecraft_version_range=[1.20.1,1.21) -forge_version=47.3.10 +forge_version=47.4.10 forge_version_range=[47,) loader_version_range=[47,) mapping_channel=official @@ -15,10 +15,10 @@ mixin_extras_version = 0.4.1 jei_minecraft_version = 1.20.1 -jei_version = 15.19.0.85 +jei_version = 15.20.0.112 create_version = 6.0.8-290 -ponder_version = 1.0.91 -flywheel_version = 1.0.4 +ponder_version = 1.0.92 +flywheel_version = 1.0.6-beta-269 registrate_version = MC1.20-1.3.3 diff --git a/src/main/java/com/drmangotea/tfmg/TFMG.java b/src/main/java/com/drmangotea/tfmg/TFMG.java index 44cc6bb7..51aff8db 100644 --- a/src/main/java/com/drmangotea/tfmg/TFMG.java +++ b/src/main/java/com/drmangotea/tfmg/TFMG.java @@ -1,15 +1,35 @@ package com.drmangotea.tfmg; -import com.drmangotea.tfmg.base.*; +import com.drmangotea.tfmg.base.TFMGBoilerHeaters; +import com.drmangotea.tfmg.base.TFMGContraptions; +import com.drmangotea.tfmg.base.TFMGCreativeTabs; +import com.drmangotea.tfmg.base.TFMGRegistrate; +import com.drmangotea.tfmg.base.TFMGRegistries; +import com.drmangotea.tfmg.base.fluid.TFMGFluidInteractions; +import com.drmangotea.tfmg.config.TFMGConfigs; +import com.drmangotea.tfmg.content.decoration.pipes.TFMGPipes; import com.drmangotea.tfmg.content.electricity.base.ElectricNetworkManager; import com.drmangotea.tfmg.content.engines.fuels.BaseFuelTypes; import com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.fire.TFMGColoredFires; import com.drmangotea.tfmg.content.machinery.oil_processing.pumpjack.pumpjack.base.TestSavedDataManager; import com.drmangotea.tfmg.datagen.TFMGDatagen; -import com.drmangotea.tfmg.base.fluid.TFMGFluidInteractions; -import com.drmangotea.tfmg.config.TFMGConfigs; -import com.drmangotea.tfmg.content.decoration.pipes.TFMGPipes; -import com.drmangotea.tfmg.registry.*; +import com.drmangotea.tfmg.registry.TFMGBlockEntities; +import com.drmangotea.tfmg.registry.TFMGBlocks; +import com.drmangotea.tfmg.registry.TFMGCableTypes; +import com.drmangotea.tfmg.registry.TFMGElectrodes; +import com.drmangotea.tfmg.registry.TFMGEncasedBlocks; +import com.drmangotea.tfmg.registry.TFMGEntityTypes; +import com.drmangotea.tfmg.registry.TFMGFluids; +import com.drmangotea.tfmg.registry.TFMGItems; +import com.drmangotea.tfmg.registry.TFMGMenuTypes; +import com.drmangotea.tfmg.registry.TFMGMobEffects; +import com.drmangotea.tfmg.registry.TFMGMountedStorageTypes; +import com.drmangotea.tfmg.registry.TFMGPackets; +import com.drmangotea.tfmg.registry.TFMGPaletteBlocks; +import com.drmangotea.tfmg.registry.TFMGPartialModels; +import com.drmangotea.tfmg.registry.TFMGParticleTypes; +import com.drmangotea.tfmg.registry.TFMGRecipeTypes; +import com.drmangotea.tfmg.registry.TFMGSoundEvents; import com.drmangotea.tfmg.worldgen.TFMGFeatures; import com.mojang.logging.LogUtils; import com.simibubi.create.foundation.item.ItemDescription; diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGBuilderTransformers.java b/src/main/java/com/drmangotea/tfmg/base/TFMGBuilderTransformers.java index 3f23d439..7a665099 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGBuilderTransformers.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGBuilderTransformers.java @@ -14,6 +14,7 @@ import com.drmangotea.tfmg.content.decoration.flywheels.TFMGFlywheelBlock; import com.drmangotea.tfmg.content.electricity.connection.copycat_cable.CopycatCableBlock; import com.drmangotea.tfmg.content.electricity.lights.neon_tube.NeonTubeBlock; import com.drmangotea.tfmg.registry.TFMGBlocks; +import com.drmangotea.tfmg.registry.TFMGTags; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllTags; import com.simibubi.create.content.contraptions.behaviour.DoorMovingInteraction; @@ -22,7 +23,12 @@ import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorMovementBeh import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock; import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogCTBehaviour; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; -import com.simibubi.create.foundation.data.*; +import com.simibubi.create.foundation.data.AssetLookup; +import com.simibubi.create.foundation.data.BlockStateGen; +import com.simibubi.create.foundation.data.CreateRegistrate; +import com.simibubi.create.foundation.data.SharedProperties; +import com.simibubi.create.foundation.data.TagGen; +import com.simibubi.create.foundation.data.recipe.CommonMetal; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; @@ -36,12 +42,20 @@ import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.world.level.ItemLike; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.PipeBlock; +import net.minecraft.world.level.block.SlabBlock; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.StairBlock; +import net.minecraft.world.level.block.WallBlock; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder; -import java.util.*; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; import java.util.function.Supplier; import static com.drmangotea.tfmg.TFMG.REGISTRATE; @@ -50,7 +64,9 @@ import static com.simibubi.create.api.behaviour.movement.MovementBehaviour.movem import static com.simibubi.create.foundation.data.BlockStateGen.axisBlock; import static com.simibubi.create.foundation.data.BlockStateGen.simpleCubeAll; import static com.simibubi.create.foundation.data.ModelGen.customItemModel; -import static com.simibubi.create.foundation.data.TagGen.*; +import static com.simibubi.create.foundation.data.TagGen.axeOrPickaxe; +import static com.simibubi.create.foundation.data.TagGen.pickaxeOnly; +import static com.simibubi.create.foundation.data.TagGen.tagBlockAndItem; @SuppressWarnings("removal") public class TFMGBuilderTransformers { @@ -144,7 +160,7 @@ public class TFMGBuilderTransformers { String casing, Supplier casingShift, Supplier drop, boolean large) { String encasedSuffix; if (!large) { - encasedSuffix = "_encased_cogwheel_side" + (large ? "_connected" : ""); + encasedSuffix = "_encased_cogwheel_side"; } else encasedSuffix = "_encased_cogwheel_side_large"; String blockFolder = large ? "encased_large_cogwheel" : "encased_cogwheel"; String wood = casing.equals("steel") ? "steel_casing" : "heavy_machinery_casing"; @@ -215,7 +231,7 @@ public class TFMGBuilderTransformers { public static BlockEntry truss(String name) { return REGISTRATE.block(name + "_truss", TrussBlock::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .transform(pickaxeOnly()) .addLayer(() -> RenderType::cutoutMipped) @@ -267,7 +283,7 @@ public class TFMGBuilderTransformers { REGISTRATE.block(color + "_caution_block", TFMGHorizontalDirectionalBlock::new) .initialProperties(() -> Blocks.COPPER_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .transform(pickaxeOnly()) .blockstate((c, p) -> p.horizontalBlock(c.get(), p.models() @@ -276,7 +292,7 @@ public class TFMGBuilderTransformers { .texture("particle", p.modLoc("block/caution_block/" + color)) )) .tag(BlockTags.NEEDS_STONE_TOOL) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("ingots/aluminum")), RecipeCategory.BUILDING_BLOCKS, c::get, 2)) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.ALUMINUM.ingots), RecipeCategory.BUILDING_BLOCKS, c, 2)) .item() .build() .lang(upperCaseColor + " Caution Block") @@ -294,13 +310,13 @@ public class TFMGBuilderTransformers { concrete.wall = REGISTRATE.block(name + "_wall", WallBlock::new) .initialProperties(() -> Blocks.STONE) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateWallBlockState(c, p, "concrete")) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.WALLS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(concrete.block.get()), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(concrete.block.get()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .item() .transform(b -> TFMGVanillaBlockStates.transformWallItem(b, "concrete")) .build() @@ -308,13 +324,13 @@ public class TFMGBuilderTransformers { concrete.stairs = REGISTRATE.block(name + "_stairs", p -> new StairBlock(() -> concrete.block.get().defaultBlockState(), p)) .initialProperties(() -> Blocks.STONE) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateStairBlockState(c, p, "concrete")) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.STAIRS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(concrete.block.get()), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(concrete.block.get()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .item() //.transform(b -> TFMGVanillaBlockStates.transformStairItem(b, "concrete")) .transform(customItemModel("concrete_stairs")) @@ -324,23 +340,23 @@ public class TFMGBuilderTransformers { concrete.block = REGISTRATE.block(name, Block::new) .initialProperties(() -> Blocks.STONE) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("concrete")) .tag(BlockTags.NEEDS_STONE_TOOL) - .transform(tagBlockAndItem(com.drmangotea.tfmg.registry.TFMGTags.forgeBlockTag("concrete"), com.drmangotea.tfmg.registry.TFMGTags.forgeItemTag("concrete"))) + .transform(tagBlockAndItem(TFMGTags.TFMGBlockTags.CONCRETE.tag, TFMGTags.TFMGItemTags.CONCRETE.tag)) .build() .register(); concrete.slab = REGISTRATE.block(name + "_slab", SlabBlock::new) .initialProperties(() -> Blocks.STONE) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateSlabBlockState(c, p, "concrete")) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.SLABS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(concrete.block.get()), RecipeCategory.BUILDING_BLOCKS, c::get, 2)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(concrete.block.get()), RecipeCategory.BUILDING_BLOCKS, c, 2)) .item() .transform(customItemModel("concrete_bottom")) .register(); @@ -361,7 +377,7 @@ public class TFMGBuilderTransformers { set.block=REGISTRATE.block(color + name, Block::new) .initialProperties(() -> Blocks.STONE) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(simpleCubeAll(color + "_concrete")) .tag(BlockTags.NEEDS_STONE_TOOL) @@ -373,12 +389,12 @@ public class TFMGBuilderTransformers { set.wall=REGISTRATE.block(color + name + "_wall", WallBlock::new) .initialProperties(() -> Blocks.STONE) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateWallBlockState(c, p, color + "_concrete")) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.WALLS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(set.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(set.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .item() .transform(b -> TFMGVanillaBlockStates.transformWallItem(b, color + "_concrete")) .build() @@ -387,12 +403,12 @@ public class TFMGBuilderTransformers { set.stairs=REGISTRATE.block(color + name + "_stairs", p -> new StairBlock(() -> TFMGBlocks.CONCRETE.block.get().defaultBlockState(), p)) .initialProperties(() -> Blocks.STONE) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateStairBlockState(c, p, color + "_concrete")) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.STAIRS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(set.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(set.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .item() // .transform(b -> TFMGVanillaBlockStates.transformStairItem(b, color + "_concrete")) .transform(customItemModel(color + "_concrete_stairs")) @@ -402,12 +418,12 @@ public class TFMGBuilderTransformers { set.slab=REGISTRATE.block(color + name + "_slab", SlabBlock::new) .initialProperties(() -> Blocks.STONE) .properties(p -> p.strength(rebar ? 12f : 3.5f, rebar ? 1200f : 3.5f)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateSlabBlockState(c, p, color + "_concrete")) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.SLABS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(set.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 2)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(set.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 2)) .item() .transform(customItemModel(color + "_concrete_bottom")) .register(); @@ -431,25 +447,25 @@ public class TFMGBuilderTransformers { REGISTRATE.block(name + "_wall", WallBlock::new) - .initialProperties(() -> blockEntry.get()) + .initialProperties(blockEntry) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateWallBlockState(c, p, name)) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.WALLS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(blockEntry.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(blockEntry.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .item() .transform(b -> TFMGVanillaBlockStates.transformWallItem(b, name)) .build() .register(); REGISTRATE.block(name + "_slab", SlabBlock::new) - .initialProperties(() -> blockEntry.get()) - .properties(p -> p.requiresCorrectToolForDrops()) + .initialProperties(blockEntry) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate((c, p) -> TFMGVanillaBlockStates.generateSlabBlockState(c, p, name)) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.SLABS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(blockEntry.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 2)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(blockEntry.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 2)) .item() .transform(customItemModel(name + "_bottom")) .register(); @@ -459,7 +475,7 @@ public class TFMGBuilderTransformers { .blockstate((c, p) -> TFMGVanillaBlockStates.generateStairBlockState(c, p, name)) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(BlockTags.STAIRS) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(blockEntry.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(blockEntry.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .item() .transform(customItemModel(name + "_stairs")) .register(); diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGCreativeTabs.java b/src/main/java/com/drmangotea/tfmg/base/TFMGCreativeTabs.java index c9fec934..5cb0b38b 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGCreativeTabs.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGCreativeTabs.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.base; import com.drmangotea.tfmg.content.decoration.encased.TFMGEncasedCogwheelBlock; import com.drmangotea.tfmg.content.machinery.misc.winding_machine.SpoolItem; import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.drmangotea.tfmg.registry.TFMGEncasedBlocks; import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.AllCreativeModeTabs; import com.simibubi.create.content.processing.sequenced.SequencedAssemblyItem; diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGMetalBarsGen.java b/src/main/java/com/drmangotea/tfmg/base/TFMGMetalBarsGen.java index fb3f932d..c983beef 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGMetalBarsGen.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGMetalBarsGen.java @@ -20,7 +20,10 @@ import net.minecraftforge.client.model.generators.ModelFile; import java.util.function.Supplier; -import static net.minecraft.world.level.block.state.properties.BlockStateProperties.*; +import static net.minecraft.world.level.block.state.properties.BlockStateProperties.EAST; +import static net.minecraft.world.level.block.state.properties.BlockStateProperties.NORTH; +import static net.minecraft.world.level.block.state.properties.BlockStateProperties.SOUTH; +import static net.minecraft.world.level.block.state.properties.BlockStateProperties.WEST; public class TFMGMetalBarsGen { diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrate.java b/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrate.java index 2b21c497..33432a30 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrate.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrate.java @@ -16,11 +16,10 @@ import com.tterrag.registrate.builders.FluidBuilder; import com.tterrag.registrate.util.nullness.NonNullFunction; import net.createmod.catnip.lang.FontHelper; import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.Block; import net.minecraftforge.registries.ForgeRegistries; import static com.drmangotea.tfmg.registry.TFMGFluids.getGasTexture; -import static com.simibubi.create.foundation.data.ModelGen.customItemModel; public class TFMGRegistrate extends CreateRegistrate { public static String autoLang(String id) { diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrateTags.java b/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrateTags.java index 222d5ccc..392272e1 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrateTags.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGRegistrateTags.java @@ -2,54 +2,35 @@ package com.drmangotea.tfmg.base; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.registry.TFMGTags; -import com.simibubi.create.AllItems; -import com.simibubi.create.AllTags; import com.simibubi.create.foundation.data.TagGen; -import com.simibubi.create.foundation.data.recipe.Mods; import com.tterrag.registrate.providers.ProviderType; import com.tterrag.registrate.providers.RegistrateTagsProvider; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.ItemTags; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.Tags; -import java.util.List; - public class TFMGRegistrateTags { public static void addGenerators() { - TFMG.REGISTRATE.addDataGenerator(ProviderType.BLOCK_TAGS, TFMGRegistrateTags::genBlockTags); - TFMG.REGISTRATE.addDataGenerator(ProviderType.ITEM_TAGS, TFMGRegistrateTags::genItemTags); - // TFMG.REGISTRATE.addDataGenerator(ProviderType.FLUID_TAGS, TFMGRegistrateTags::genFluidTags); - // TFMG.REGISTRATE.addDataGenerator(ProviderType.ENTITY_TAGS, TFMGRegistrateTags::genEntityTags); + TFMG.REGISTRATE.addDataGenerator(ProviderType.BLOCK_TAGS, TFMGRegistrateTags::genBlockTags); + TFMG.REGISTRATE.addDataGenerator(ProviderType.ITEM_TAGS, TFMGRegistrateTags::genItemTags); + //TFMG.REGISTRATE.addDataGenerator(ProviderType.FLUID_TAGS, TFMGRegistrateTags::genFluidTags); + //TFMG.REGISTRATE.addDataGenerator(ProviderType.ENTITY_TAGS, TFMGRegistrateTags::genEntityTags); } private static void genItemTags(RegistrateTagsProvider provIn) { - TagGen.CreateTagsProvider prov = new TagGen.CreateTagsProvider<>(provIn, Item::builtInRegistryHolder); + TagGen.CreateTagsProvider prov = new TagGen.CreateTagsProvider<>(provIn, Item::builtInRegistryHolder); - prov.tag(TFMGTags.TFMGItemTags.RODS.tag) + prov.tag(Tags.Items.RODS) .add(Items.STICK); - - for (TFMGTags.TFMGItemTags tag : TFMGTags.TFMGItemTags.values()) { - if (tag.alwaysDatagen) { - prov.getOrCreateRawBuilder(tag.tag); - } - } } private static void genBlockTags(RegistrateTagsProvider provIn) { TagGen.CreateTagsProvider prov = new TagGen.CreateTagsProvider<>(provIn, Block::builtInRegistryHolder); - prov.tag(TFMGTags.TFMGBlockTags.PUMPJACK_HEAD.tag) .add(Blocks.IRON_BLOCK); + prov.tag(TFMGTags.TFMGBlockTags.PUMPJACK_PART.tag) .addTag(TFMGTags.TFMGBlockTags.PUMPJACK_SMALL_PART.tag); - - for (TFMGTags.TFMGBlockTags tag : TFMGTags.TFMGBlockTags.values()) { - if (tag.alwaysDatagen) { - prov.getOrCreateRawBuilder(tag.tag); - } - } } } diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGShapes.java b/src/main/java/com/drmangotea/tfmg/base/TFMGShapes.java index b541e8c6..b3d7c92e 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGShapes.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGShapes.java @@ -11,7 +11,9 @@ import net.minecraft.world.phys.shapes.VoxelShape; import java.util.function.BiFunction; -import static net.minecraft.core.Direction.*; +import static net.minecraft.core.Direction.NORTH; +import static net.minecraft.core.Direction.SOUTH; +import static net.minecraft.core.Direction.UP; public class TFMGShapes { public static final VoxelShaper diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGSpriteShifts.java b/src/main/java/com/drmangotea/tfmg/base/TFMGSpriteShifts.java index 833f5f11..68f2ed76 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGSpriteShifts.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGSpriteShifts.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.base; import com.drmangotea.tfmg.TFMG; -import com.simibubi.create.Create; import com.simibubi.create.foundation.block.connected.AllCTTypes; import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; import com.simibubi.create.foundation.block.connected.CTSpriteShifter; diff --git a/src/main/java/com/drmangotea/tfmg/base/TFMGUtils.java b/src/main/java/com/drmangotea/tfmg/base/TFMGUtils.java index 1875d823..7963d0b4 100644 --- a/src/main/java/com/drmangotea/tfmg/base/TFMGUtils.java +++ b/src/main/java/com/drmangotea/tfmg/base/TFMGUtils.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.base; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.spark.ElectricSparkParticle; import com.drmangotea.tfmg.base.spark.Spark; import com.drmangotea.tfmg.content.electricity.connection.cable_type.CableType; @@ -10,14 +9,12 @@ import com.drmangotea.tfmg.content.machinery.vat.electrode_holder.electrode.Elec import com.drmangotea.tfmg.registry.TFMGEntityTypes; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import com.simibubi.create.AllSoundEvents; import com.simibubi.create.Create; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import com.simibubi.create.foundation.fluid.SmartFluidTank; import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.lang.LangBuilder; import net.minecraft.ChatFormatting; -import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.renderer.LightTexture; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -32,7 +29,6 @@ import net.minecraft.util.RandomSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LightLayer; import net.minecraft.world.level.block.entity.BlockEntity; diff --git a/src/main/java/com/drmangotea/tfmg/base/fluid/AcidFluidType.java b/src/main/java/com/drmangotea/tfmg/base/fluid/AcidFluidType.java index 88fbdbd5..31b0eab7 100644 --- a/src/main/java/com/drmangotea/tfmg/base/fluid/AcidFluidType.java +++ b/src/main/java/com/drmangotea/tfmg/base/fluid/AcidFluidType.java @@ -2,14 +2,12 @@ package com.drmangotea.tfmg.base.fluid; import com.drmangotea.tfmg.datagen.TFMGDamageSources; -import com.drmangotea.tfmg.datagen.TFMGDamageTypes; import com.simibubi.create.AllFluids; import com.simibubi.create.Create; import com.tterrag.registrate.builders.FluidBuilder; import net.createmod.catnip.theme.Color; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.material.FluidState; @@ -17,7 +15,6 @@ import net.minecraft.world.phys.Vec3; import net.minecraftforge.fluids.FluidStack; import org.joml.Vector3f; -import java.awt.*; import java.util.function.Supplier; public class AcidFluidType extends AllFluids.TintedFluidType { diff --git a/src/main/java/com/drmangotea/tfmg/base/fluid/ConcreteFluid.java b/src/main/java/com/drmangotea/tfmg/base/fluid/ConcreteFluid.java index d97fa1f5..b57140ac 100644 --- a/src/main/java/com/drmangotea/tfmg/base/fluid/ConcreteFluid.java +++ b/src/main/java/com/drmangotea/tfmg/base/fluid/ConcreteFluid.java @@ -10,8 +10,6 @@ import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.FluidState; import net.minecraftforge.fluids.ForgeFlowingFluid; -import static com.drmangotea.tfmg.content.decoration.concrete.ConcreteloggedBlock.CONCRETELOGGED; - public class ConcreteFluid extends ForgeFlowingFluid { protected ConcreteFluid(Properties properties) { super(properties); diff --git a/src/main/java/com/drmangotea/tfmg/base/fluid/GasFluidType.java b/src/main/java/com/drmangotea/tfmg/base/fluid/GasFluidType.java index 075e5c9f..652cebc8 100644 --- a/src/main/java/com/drmangotea/tfmg/base/fluid/GasFluidType.java +++ b/src/main/java/com/drmangotea/tfmg/base/fluid/GasFluidType.java @@ -4,7 +4,6 @@ package com.drmangotea.tfmg.base.fluid; import com.drmangotea.tfmg.registry.TFMGFluids; import com.mojang.blaze3d.shaders.FogShape; import com.mojang.blaze3d.systems.RenderSystem; -import com.simibubi.create.AllFluids; import com.tterrag.registrate.builders.FluidBuilder; import net.minecraft.client.Camera; import net.minecraft.client.multiplayer.ClientLevel; @@ -15,12 +14,10 @@ import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.material.FluidState; import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidType; import org.jetbrains.annotations.NotNull; import org.joml.Vector3f; import java.util.function.Consumer; -import java.util.function.Supplier; import static com.drmangotea.tfmg.registry.TFMGFluids.getGasTexture; diff --git a/src/main/java/com/drmangotea/tfmg/base/fluid/HotFluidType.java b/src/main/java/com/drmangotea/tfmg/base/fluid/HotFluidType.java index b710d5cf..51bde4e5 100644 --- a/src/main/java/com/drmangotea/tfmg/base/fluid/HotFluidType.java +++ b/src/main/java/com/drmangotea/tfmg/base/fluid/HotFluidType.java @@ -1,14 +1,11 @@ package com.drmangotea.tfmg.base.fluid; import com.drmangotea.tfmg.registry.TFMGFluids; -import com.simibubi.create.AllFluids; import com.simibubi.create.Create; import com.tterrag.registrate.builders.FluidBuilder; import net.createmod.catnip.theme.Color; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.damagesource.DamageSource; -import net.minecraft.world.damagesource.DamageSources; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.level.BlockAndTintGetter; diff --git a/src/main/java/com/drmangotea/tfmg/base/fluid/TFMGFluidInteractions.java b/src/main/java/com/drmangotea/tfmg/base/fluid/TFMGFluidInteractions.java index 9ff3d2d9..27fa1f92 100644 --- a/src/main/java/com/drmangotea/tfmg/base/fluid/TFMGFluidInteractions.java +++ b/src/main/java/com/drmangotea/tfmg/base/fluid/TFMGFluidInteractions.java @@ -1,15 +1,18 @@ package com.drmangotea.tfmg.base.fluid; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.simibubi.create.content.decoration.palettes.AllPaletteBlocks; -import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes; import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.ForgeMod; import net.minecraftforge.fluids.FluidInteractionRegistry; -import net.minecraftforge.registries.ForgeRegistries; -import static com.drmangotea.tfmg.registry.TFMGFluids.*; +import static com.drmangotea.tfmg.registry.TFMGFluids.COOLING_FLUID; +import static com.drmangotea.tfmg.registry.TFMGFluids.CRUDE_OIL; +import static com.drmangotea.tfmg.registry.TFMGFluids.DIESEL; +import static com.drmangotea.tfmg.registry.TFMGFluids.GASOLINE; +import static com.drmangotea.tfmg.registry.TFMGFluids.HEAVY_OIL; +import static com.drmangotea.tfmg.registry.TFMGFluids.KEROSENE; +import static com.drmangotea.tfmg.registry.TFMGFluids.LUBRICATION_OIL; +import static com.drmangotea.tfmg.registry.TFMGFluids.NAPHTHA; public class TFMGFluidInteractions { public static void registerFluidInteractions() { diff --git a/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPartial.java b/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPartial.java index 3650df28..0676f34b 100644 --- a/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPartial.java +++ b/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPartial.java @@ -4,9 +4,7 @@ package com.drmangotea.tfmg.base.palettes; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGCreativeTabs; import com.drmangotea.tfmg.registry.TFMGPaletteStoneTypes; -import com.simibubi.create.Create; import com.simibubi.create.foundation.data.CreateRegistrate; - import com.simibubi.create.foundation.utility.CreateLang; import com.tterrag.registrate.builders.BlockBuilder; import com.tterrag.registrate.builders.ItemBuilder; @@ -35,7 +33,6 @@ import net.minecraftforge.client.model.generators.ModelFile; import java.util.Arrays; import java.util.function.Supplier; - import static com.drmangotea.tfmg.TFMG.REGISTRATE; import static com.simibubi.create.foundation.data.TagGen.pickaxeOnly; diff --git a/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPattern.java b/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPattern.java index d24f04f4..8b7268eb 100644 --- a/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPattern.java +++ b/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPattern.java @@ -3,7 +3,13 @@ package com.drmangotea.tfmg.base.palettes; import com.drmangotea.tfmg.TFMG; import com.simibubi.create.content.decoration.palettes.ConnectedPillarBlock; -import com.simibubi.create.foundation.block.connected.*; +import com.simibubi.create.foundation.block.connected.AllCTTypes; +import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry; +import com.simibubi.create.foundation.block.connected.CTSpriteShifter; +import com.simibubi.create.foundation.block.connected.CTType; +import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour; +import com.simibubi.create.foundation.block.connected.HorizontalCTBehaviour; +import com.simibubi.create.foundation.block.connected.RotatedPillarCTBehaviour; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import com.tterrag.registrate.providers.RegistrateRecipeProvider; @@ -28,7 +34,9 @@ import java.util.function.Supplier; import static com.drmangotea.tfmg.base.palettes.TFMGPaletteBlockPartial.ALL_PARTIALS; import static com.drmangotea.tfmg.base.palettes.TFMGPaletteBlockPartial.FOR_POLISHED; -import static com.drmangotea.tfmg.base.palettes.TFMGPaletteBlockPattern.PatternNameType.*; +import static com.drmangotea.tfmg.base.palettes.TFMGPaletteBlockPattern.PatternNameType.PREFIX; +import static com.drmangotea.tfmg.base.palettes.TFMGPaletteBlockPattern.PatternNameType.SUFFIX; +import static com.drmangotea.tfmg.base.palettes.TFMGPaletteBlockPattern.PatternNameType.WRAP; public class TFMGPaletteBlockPattern { @@ -215,7 +223,7 @@ public class TFMGPaletteBlockPattern { ResourceLocation resLoc = texture.srcFactory.apply(variant); ResourceLocation resLocTarget = texture.targetFactory.apply(variant); return CTSpriteShifter.getCT(texture.type, resLoc, - new ResourceLocation(resLocTarget.getNamespace(), resLocTarget.getPath() + "_connected")); + ResourceLocation.fromNamespaceAndPath(resLocTarget.getNamespace(), resLocTarget.getPath() + "_connected")); } @FunctionalInterface diff --git a/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPalettesVariantEntry.java b/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPalettesVariantEntry.java index 9dfd481b..342cdaca 100644 --- a/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPalettesVariantEntry.java +++ b/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPalettesVariantEntry.java @@ -18,7 +18,6 @@ import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; - import static com.drmangotea.tfmg.TFMG.REGISTRATE; import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures; import static com.simibubi.create.foundation.data.TagGen.pickaxeOnly; diff --git a/src/main/java/com/drmangotea/tfmg/base/spark/BlueSpark.java b/src/main/java/com/drmangotea/tfmg/base/spark/BlueSpark.java index 866f5ff7..13861360 100644 --- a/src/main/java/com/drmangotea/tfmg/base/spark/BlueSpark.java +++ b/src/main/java/com/drmangotea/tfmg/base/spark/BlueSpark.java @@ -1,11 +1,8 @@ package com.drmangotea.tfmg.base.spark; - - import com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.fire.BlueFireBlock; import com.drmangotea.tfmg.registry.TFMGEntityTypes; -import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.content.trains.CubeParticleData; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleOptions; @@ -15,7 +12,6 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.projectile.ThrowableProjectile; -import net.minecraft.world.item.Item; import net.minecraft.world.level.Level; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.EntityHitResult; diff --git a/src/main/java/com/drmangotea/tfmg/base/spark/DryIceFlake.java b/src/main/java/com/drmangotea/tfmg/base/spark/DryIceFlake.java index c5daaed0..166e7dc3 100644 --- a/src/main/java/com/drmangotea/tfmg/base/spark/DryIceFlake.java +++ b/src/main/java/com/drmangotea/tfmg/base/spark/DryIceFlake.java @@ -22,7 +22,6 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.EntityHitResult; import net.minecraft.world.phys.HitResult; -import java.util.List; import java.util.stream.Stream; public class DryIceFlake extends ThrowableProjectile { diff --git a/src/main/java/com/drmangotea/tfmg/base/spark/DryIceFlakeRenderer.java b/src/main/java/com/drmangotea/tfmg/base/spark/DryIceFlakeRenderer.java index 473e3925..57c4e61f 100644 --- a/src/main/java/com/drmangotea/tfmg/base/spark/DryIceFlakeRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/base/spark/DryIceFlakeRenderer.java @@ -17,7 +17,7 @@ import org.joml.Matrix4f; @OnlyIn(Dist.CLIENT) public class DryIceFlakeRenderer extends EntityRenderer { - private static final ResourceLocation TEXTURE_LOCATION = new ResourceLocation("tfmg:textures/entity/dry_ice_flake.png"); + private static final ResourceLocation TEXTURE_LOCATION = ResourceLocation.parse("tfmg:textures/entity/dry_ice_flake.png"); private static final RenderType RENDER_TYPE = RenderType.entityCutoutNoCull(TEXTURE_LOCATION); public DryIceFlakeRenderer(EntityRendererProvider.Context context) { super(context); diff --git a/src/main/java/com/drmangotea/tfmg/base/spark/GreenSpark.java b/src/main/java/com/drmangotea/tfmg/base/spark/GreenSpark.java index b1823f13..960b2f0a 100644 --- a/src/main/java/com/drmangotea/tfmg/base/spark/GreenSpark.java +++ b/src/main/java/com/drmangotea/tfmg/base/spark/GreenSpark.java @@ -1,10 +1,8 @@ package com.drmangotea.tfmg.base.spark; - import com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.fire.GreenFireBlock; import com.drmangotea.tfmg.registry.TFMGEntityTypes; -import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.content.trains.CubeParticleData; import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleOptions; @@ -14,7 +12,6 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.projectile.ThrowableProjectile; -import net.minecraft.world.item.Item; import net.minecraft.world.level.Level; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.EntityHitResult; diff --git a/src/main/java/com/drmangotea/tfmg/base/spark/SparkRenderer.java b/src/main/java/com/drmangotea/tfmg/base/spark/SparkRenderer.java index 5add9d1e..2a02cdcd 100644 --- a/src/main/java/com/drmangotea/tfmg/base/spark/SparkRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/base/spark/SparkRenderer.java @@ -17,7 +17,7 @@ import org.joml.Matrix4f; @OnlyIn(Dist.CLIENT) public class SparkRenderer extends EntityRenderer { - private static final ResourceLocation TEXTURE_LOCATION = new ResourceLocation("textures/particle/lava.png"); + private static final ResourceLocation TEXTURE_LOCATION = ResourceLocation.parse("textures/particle/lava.png"); private static final RenderType RENDER_TYPE = RenderType.entityCutoutNoCull(TEXTURE_LOCATION); public SparkRenderer(EntityRendererProvider.Context p_173962_) { super(p_173962_); diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/FrameBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/FrameBlock.java index 8bdbc54e..b40e1621 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/FrameBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/FrameBlock.java @@ -7,7 +7,6 @@ import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.RotatedPillarBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.material.FluidState; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/TrussBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/TrussBlock.java index e0793b9f..d99712fc 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/TrussBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/TrussBlock.java @@ -8,15 +8,9 @@ import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.RotatedPillarBlock; -import net.minecraft.world.level.block.Rotation; -import net.minecraft.world.level.block.SimpleWaterloggedBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraft.world.level.block.state.properties.BooleanProperty; -import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.level.material.FluidState; -import net.minecraft.world.level.material.Fluids; public class TrussBlock extends RotatedPillarBlock implements ProperWaterloggedBlock, IWrenchable { diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/cogs/TFMGCogwheelVisual.java b/src/main/java/com/drmangotea/tfmg/content/decoration/cogs/TFMGCogwheelVisual.java index a8575afc..6649c06e 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/cogs/TFMGCogwheelVisual.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/cogs/TFMGCogwheelVisual.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.content.decoration.cogs; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGPartialModels; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; import com.simibubi.create.content.kinetics.base.RotatingInstance; @@ -12,14 +11,10 @@ import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockEn import com.simibubi.create.content.kinetics.simpleRelays.ICogWheel; import com.simibubi.create.foundation.render.AllInstanceTypes; import dev.engine_room.flywheel.api.instance.Instance; -import dev.engine_room.flywheel.api.material.Material; import dev.engine_room.flywheel.api.model.Model; import dev.engine_room.flywheel.api.visual.BlockEntityVisual; import dev.engine_room.flywheel.api.visualization.VisualizationContext; -import dev.engine_room.flywheel.lib.material.Materials; import dev.engine_room.flywheel.lib.model.Models; -import dev.engine_room.flywheel.lib.model.baked.ForgeBlockModelBuilder; -import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.minecraft.core.Direction; import java.util.function.Consumer; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/cogs/TFMGEncasedCogRenderer.java b/src/main/java/com/drmangotea/tfmg/content/decoration/cogs/TFMGEncasedCogRenderer.java index f166ecd2..e4264295 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/cogs/TFMGEncasedCogRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/cogs/TFMGEncasedCogRenderer.java @@ -9,7 +9,6 @@ import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockEn import com.simibubi.create.content.kinetics.simpleRelays.SimpleKineticBlockEntity; import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogwheelBlock; import dev.engine_room.flywheel.api.visualization.VisualizationManager; -import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.data.Iterate; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/ConcreteloggedBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/ConcreteloggedBlock.java index 1b1a0522..9f745ea6 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/ConcreteloggedBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/ConcreteloggedBlock.java @@ -1,8 +1,6 @@ package com.drmangotea.tfmg.content.decoration.concrete; -import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGFluids; -import com.simibubi.create.foundation.data.SharedProperties; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; import net.minecraft.util.RandomSource; @@ -14,9 +12,7 @@ import net.minecraft.world.item.Items; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.block.SimpleWaterloggedBlock; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/RebarPillarBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/RebarPillarBlock.java index 6f5d9bcd..f6e56800 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/RebarPillarBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/concrete/RebarPillarBlock.java @@ -1,7 +1,7 @@ package com.drmangotea.tfmg.content.decoration.concrete; -import com.drmangotea.tfmg.base.blocks.TFMGDirectionalBlock; import com.drmangotea.tfmg.base.TFMGShapes; +import com.drmangotea.tfmg.base.blocks.TFMGDirectionalBlock; import com.drmangotea.tfmg.registry.TFMGBlocks; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/doors/TFMGSlidingDoorRenderer.java b/src/main/java/com/drmangotea/tfmg/content/decoration/doors/TFMGSlidingDoorRenderer.java index c8e6e622..79ce9f82 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/doors/TFMGSlidingDoorRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/doors/TFMGSlidingDoorRenderer.java @@ -1,15 +1,10 @@ package com.drmangotea.tfmg.content.decoration.doors; - import com.drmangotea.tfmg.registry.TFMGPartialModels; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import com.simibubi.create.AllPartialModels; -import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlock; -import com.simibubi.create.content.decoration.slidingDoor.SlidingDoorBlockEntity; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; - import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.data.Couple; import net.createmod.catnip.data.Iterate; @@ -26,7 +21,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.DoorHingeSide; import net.minecraft.world.level.block.state.properties.DoubleBlockHalf; import net.minecraft.world.phys.Vec3; - import net.minecraftforge.registries.ForgeRegistries; public class TFMGSlidingDoorRenderer extends SafeBlockEntityRenderer { diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/flywheels/TFMGFlywheelBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/decoration/flywheels/TFMGFlywheelBlockEntity.java index 8c8e4f65..c15486f0 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/flywheels/TFMGFlywheelBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/flywheels/TFMGFlywheelBlockEntity.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.decoration.flywheels; import com.simibubi.create.content.kinetics.base.KineticBlockEntity; -import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.animation.LerpedFloat; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/flywheels/TFMGFlywheelVisual.java b/src/main/java/com/drmangotea/tfmg/content/decoration/flywheels/TFMGFlywheelVisual.java index dc38e01c..3f015833 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/flywheels/TFMGFlywheelVisual.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/flywheels/TFMGFlywheelVisual.java @@ -1,17 +1,14 @@ package com.drmangotea.tfmg.content.decoration.flywheels; -import com.drmangotea.tfmg.registry.TFMGPartialModels; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; import com.simibubi.create.content.kinetics.base.RotatingInstance; -import com.simibubi.create.content.kinetics.flywheel.FlywheelBlockEntity; import com.simibubi.create.foundation.render.AllInstanceTypes; import dev.engine_room.flywheel.api.instance.Instance; import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.lib.instance.InstanceTypes; import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.model.Models; -import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; import net.createmod.catnip.math.AngleHelper; import net.minecraft.core.Direction; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/SigmaPipeAttachmentModel.java b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/SigmaPipeAttachmentModel.java index 36d47ff8..37236425 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/SigmaPipeAttachmentModel.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/SigmaPipeAttachmentModel.java @@ -1,20 +1,13 @@ package com.drmangotea.tfmg.content.decoration.pipes; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import com.simibubi.create.content.fluids.FluidTransportBehaviour; -import org.jetbrains.annotations.NotNull; - import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.decoration.bracket.BracketedBlockEntityBehaviour; +import com.simibubi.create.content.fluids.FluidTransportBehaviour; import com.simibubi.create.content.fluids.FluidTransportBehaviour.AttachmentTypes; import com.simibubi.create.content.fluids.FluidTransportBehaviour.AttachmentTypes.ComponentPartials; import com.simibubi.create.content.fluids.pipes.FluidPipeBlock; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.model.BakedModelWrapperWithData; - import net.createmod.catnip.data.Iterate; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderType; @@ -25,11 +18,15 @@ import net.minecraft.core.Direction; import net.minecraft.util.RandomSource; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.block.state.BlockState; - import net.minecraftforge.client.ChunkRenderTypeSet; import net.minecraftforge.client.model.data.ModelData; import net.minecraftforge.client.model.data.ModelData.Builder; import net.minecraftforge.client.model.data.ModelProperty; +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; public class SigmaPipeAttachmentModel extends BakedModelWrapperWithData { diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGEncasedPipeBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGEncasedPipeBlock.java index 34085a56..7f1379e6 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGEncasedPipeBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGEncasedPipeBlock.java @@ -4,7 +4,6 @@ import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.simibubi.create.content.fluids.FluidTransportBehaviour; import com.simibubi.create.content.fluids.pipes.EncasedPipeBlock; import com.simibubi.create.content.fluids.pipes.FluidPipeBlockEntity; - import net.createmod.catnip.data.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipeAttachmentModel.java b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipeAttachmentModel.java index 2f752a21..29f2aef6 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipeAttachmentModel.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipeAttachmentModel.java @@ -8,7 +8,6 @@ import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour import com.simibubi.create.foundation.model.BakedModelWrapperWithData; import net.createmod.catnip.data.Iterate; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.model.BakedQuad; import net.minecraft.client.resources.model.BakedModel; @@ -28,8 +27,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static net.minecraft.world.level.block.PipeBlock.PROPERTY_BY_DIRECTION; - @OnlyIn(Dist.CLIENT) public class TFMGPipeAttachmentModel extends BakedModelWrapperWithData { diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipes.java b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipes.java index 902f7ed5..4eaddad8 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipes.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/pipes/TFMGPipes.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.decoration.pipes; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGCreativeTabs; import com.drmangotea.tfmg.base.TFMGRegistrate; import com.drmangotea.tfmg.config.TFMGStress; @@ -8,7 +7,6 @@ import com.simibubi.create.AllBlocks; import com.simibubi.create.AllSpriteShifts; import com.simibubi.create.content.decoration.encasing.EncasedCTBehaviour; import com.simibubi.create.content.decoration.encasing.EncasingRegistry; -import com.simibubi.create.content.fluids.PipeAttachmentModel; import com.simibubi.create.content.fluids.pipes.SmartFluidPipeGenerator; import com.simibubi.create.content.fluids.pipes.valve.FluidValveBlock; import com.simibubi.create.foundation.data.AssetLookup; @@ -27,7 +25,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.function.Supplier; import static com.drmangotea.tfmg.TFMG.REGISTRATE; import static com.simibubi.create.foundation.data.ModelGen.customItemModel; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/TFMGFluidTankRenderer.java b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/TFMGFluidTankRenderer.java index d401b78c..b13b512a 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/TFMGFluidTankRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/TFMGFluidTankRenderer.java @@ -1,11 +1,9 @@ package com.drmangotea.tfmg.content.decoration.tanks; -import com.drmangotea.tfmg.content.decoration.tanks.steel.SteelTankBlockEntity; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; -import com.simibubi.create.foundation.fluid.FluidRenderer; import net.createmod.catnip.animation.LerpedFloat; import net.createmod.catnip.platform.ForgeCatnipServices; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelFluidTankRenderer.java b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelFluidTankRenderer.java index 6771b841..cdfca12c 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelFluidTankRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelFluidTankRenderer.java @@ -6,10 +6,9 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.simibubi.create.AllPartialModels; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; -import com.simibubi.create.foundation.fluid.FluidRenderer; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.data.Iterate; import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.data.Iterate; import net.createmod.catnip.render.CachedBuffers; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlock.java b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlock.java index ae238f82..33078794 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlock.java @@ -11,7 +11,6 @@ import com.simibubi.create.foundation.block.IBE; import com.simibubi.create.foundation.blockEntity.ComparatorUtil; import com.simibubi.create.foundation.fluid.FluidHelper; import com.simibubi.create.foundation.fluid.FluidHelper.FluidExchange; - import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.particles.BlockParticleOption; @@ -20,7 +19,6 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.util.Mth; -import net.minecraft.util.StringRepresentable; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlockEntity.java index 40d91027..8a4bbe6a 100644 --- a/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/decoration/tanks/steel/SteelTankBlockEntity.java @@ -4,15 +4,14 @@ import com.drmangotea.tfmg.registry.TFMGBlocks; import com.simibubi.create.api.boiler.BoilerHeater; import com.simibubi.create.api.connectivity.ConnectivityHandler; import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; -import com.simibubi.create.content.fluids.tank.BoilerHeaters; import com.simibubi.create.content.fluids.tank.FluidTankBlock; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import com.simibubi.create.foundation.blockEntity.IMultiBlockEntityContainer; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.fluid.SmartFluidTank; -import net.createmod.catnip.data.Iterate; -import net.createmod.catnip.animation.LerpedFloat; import com.simibubi.create.infrastructure.config.AllConfigs; +import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.data.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/base/ElectricalGroup.java b/src/main/java/com/drmangotea/tfmg/content/electricity/base/ElectricalGroup.java index 8da9b9ee..ba801193 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/base/ElectricalGroup.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/base/ElectricalGroup.java @@ -1,7 +1,5 @@ package com.drmangotea.tfmg.content.electricity.base; -import java.util.List; - public class ElectricalGroup { public int id; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/base/ElectricalNetwork.java b/src/main/java/com/drmangotea/tfmg/content/electricity/base/ElectricalNetwork.java index 45486537..b2343e14 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/base/ElectricalNetwork.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/base/ElectricalNetwork.java @@ -1,14 +1,14 @@ package com.drmangotea.tfmg.content.electricity.base; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.electricity.utilities.diode.ElectricDiodeBlockEntity; import com.drmangotea.tfmg.content.electricity.utilities.electric_motor.ElectricMotorBlockEntity; import com.drmangotea.tfmg.content.electricity.utilities.transformer.TransformerBlockEntity; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.world.level.block.Blocks; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class ElectricalNetwork { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/base/NetworkUpdatePacket.java b/src/main/java/com/drmangotea/tfmg/content/electricity/base/NetworkUpdatePacket.java index 6f78c72b..815248f6 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/base/NetworkUpdatePacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/base/NetworkUpdatePacket.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.electricity.base; -import com.drmangotea.tfmg.content.electricity.utilities.diode.ElectricDiodeBlockEntity; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.networking.BlockEntityDataPacket; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchItem.java b/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchItem.java index 1db26e4b..99579256 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchItem.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.content.electricity.configuration_wrench; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.content.electricity.base.IElectric; -import com.drmangotea.tfmg.content.electricity.base.KineticElectricBlockEntity; import com.drmangotea.tfmg.content.electricity.utilities.electric_motor.ElectricMotorBlockEntity; import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; import net.createmod.catnip.gui.ScreenOpener; @@ -12,7 +11,6 @@ import net.minecraft.sounds.SoundSource; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.InteractionResultHolder; -import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchPacket.java b/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchPacket.java index beb21b54..18b62986 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/configuration_wrench/ElectriciansWrenchPacket.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.electricity.configuration_wrench; -import com.drmangotea.tfmg.TFMG; import com.simibubi.create.foundation.networking.SimplePacketBase; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cable_hub/CableHubBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cable_hub/CableHubBlock.java index 8ce4748e..8547b389 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cable_hub/CableHubBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cable_hub/CableHubBlock.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.electricity.connection.cable_hub; -import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.simibubi.create.content.equipment.wrench.IWrenchable; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cable_type/CableTypeBuilder.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cable_type/CableTypeBuilder.java index 8253de23..8c49c63e 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cable_type/CableTypeBuilder.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cable_type/CableTypeBuilder.java @@ -20,7 +20,7 @@ public class CableTypeBuilder extends AbstractBuilder factory; - private NonNullSupplier initialProperties = () -> new CableType.Properties(new ResourceLocation(getOwner().getModid(), getName())); + private NonNullSupplier initialProperties = () -> new CableType.Properties(ResourceLocation.fromNamespaceAndPath(getOwner().getModid(), getName())); private NonNullFunction propertiesCallback = NonNullUnaryOperator.identity(); public CableTypeBuilder(AbstractRegistrate owner, P parent, String name, BuilderCallback callback, NonNullFunction factory) { @@ -60,7 +60,7 @@ public class CableTypeBuilder extends AbstractBuilder register() { - TFMGRegistries.registeredCableTypes.put(new ResourceLocation(getOwner().getModid(), getName()), createEntry()); + TFMGRegistries.registeredCableTypes.put(ResourceLocation.fromNamespaceAndPath(getOwner().getModid(), getName()), createEntry()); return (CableTypeEntry) super.register(); } } diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnection.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnection.java index 73b111d1..d6622d47 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnection.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnection.java @@ -60,7 +60,7 @@ public class CableConnection { BlockPos blockPos1 = BlockPos.of(compoundTag.getLong("Pos")); boolean visible = compoundTag.getBoolean("Visible"); - CableType type = TFMGUtils.getCableType(new ResourceLocation(compoundTag.getString("CableType"))); + CableType type = TFMGUtils.getCableType(ResourceLocation.parse(compoundTag.getString("CableType"))); return new CableConnection(pos1,pos2,blockPos1,type,visible); } public float getLength(){ diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnectorBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnectorBlockEntity.java index 0a042078..e748a87b 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnectorBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnectorBlockEntity.java @@ -1,16 +1,12 @@ package com.drmangotea.tfmg.content.electricity.connection.cables; -import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; import com.simibubi.create.api.equipment.goggles.IHaveHoveringInformation; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; - import net.createmod.catnip.animation.LerpedFloat; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.chat.Component; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnectorRenderer.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnectorRenderer.java index 2f90eddd..23077f9b 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnectorRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/cables/CableConnectorRenderer.java @@ -1,21 +1,15 @@ package com.drmangotea.tfmg.content.electricity.connection.cables; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; -import com.drmangotea.tfmg.content.machinery.misc.winding_machine.SpoolItem; import com.drmangotea.tfmg.registry.TFMGTags; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; -import net.createmod.catnip.animation.LerpedFloat; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.phys.Vec3; import java.awt.*; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlock.java index 32923e79..2c6cc25e 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlock.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.electricity.connection.copycat_cable; - import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.drmangotea.tfmg.registry.TFMGBlocks; @@ -26,8 +25,17 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.level.*; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.BlockAndTintGetter; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Explosion; +import net.minecraft.world.level.GrassColor; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.EntityBlock; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.StairBlock; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; @@ -38,7 +46,6 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.model.data.ModelDataManager; -import net.minecraftforge.network.PacketDistributor; import javax.annotation.Nullable; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockEntity.java index 7061f21a..f2091fe1 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockEntity.java @@ -1,19 +1,22 @@ package com.drmangotea.tfmg.content.electricity.connection.copycat_cable; import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.content.electricity.base.*; -import com.drmangotea.tfmg.registry.TFMGBlocks; +import com.drmangotea.tfmg.content.electricity.base.ElectricBlockValues; +import com.drmangotea.tfmg.content.electricity.base.ElectricNetworkManager; +import com.drmangotea.tfmg.content.electricity.base.ElectricalGroup; +import com.drmangotea.tfmg.content.electricity.base.ElectricalNetwork; +import com.drmangotea.tfmg.content.electricity.base.IElectric; +import com.drmangotea.tfmg.content.electricity.base.NetworkUpdatePacket; +import com.drmangotea.tfmg.content.electricity.base.VoltageAlteringBlockEntity; import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.AllBlocks; +import com.simibubi.create.api.equipment.goggles.IHaveHoveringInformation; import com.simibubi.create.content.decoration.copycat.CopycatBlock; import com.simibubi.create.content.decoration.copycat.CopycatBlockEntity; -import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; -import com.simibubi.create.api.equipment.goggles.IHaveHoveringInformation; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockModel.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockModel.java index e4dace30..54d95346 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockModel.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/copycat_cable/CopycatCableBlockModel.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.electricity.connection.copycat_cable; import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.simibubi.create.AllBlocks; import com.simibubi.create.content.decoration.copycat.CopycatSpecialCases; import com.simibubi.create.foundation.model.BakedModelHelper; import com.simibubi.create.foundation.model.BakedQuadHelper; @@ -15,7 +14,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.util.RandomSource; import net.minecraft.world.level.BlockAndTintGetter; -import net.minecraft.world.level.block.DirectionalBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableBlockEntity.java index 4f2078e9..d858b50d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableBlockEntity.java @@ -1,16 +1,14 @@ package com.drmangotea.tfmg.content.electricity.connection.diagonal; - import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; -import com.drmangotea.tfmg.registry.TFMGBlockEntities; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import static com.drmangotea.tfmg.content.electricity.connection.diagonal.DiagonalCableBlock.*; -import static net.minecraft.world.level.block.DirectionalBlock.FACING; +import static com.drmangotea.tfmg.content.electricity.connection.diagonal.DiagonalCableBlock.FACING_PRIMARY; +import static com.drmangotea.tfmg.content.electricity.connection.diagonal.DiagonalCableBlock.FACING_SECONDARY; public class DiagonalCableBlockEntity extends ElectricBlockEntity { public DiagonalCableBlockEntity(BlockEntityType type, BlockPos pos, BlockState state) { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableGenerator.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableGenerator.java index 796768ef..13cf02b1 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableGenerator.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/diagonal/DiagonalCableGenerator.java @@ -11,7 +11,12 @@ import net.minecraftforge.client.model.generators.ModelFile; import static com.drmangotea.tfmg.content.electricity.connection.diagonal.DiagonalCableBlock.FACING_PRIMARY; import static com.drmangotea.tfmg.content.electricity.connection.diagonal.DiagonalCableBlock.FACING_SECONDARY; import static com.simibubi.create.foundation.data.AssetLookup.partialBaseModel; -import static net.minecraft.core.Direction.*; +import static net.minecraft.core.Direction.DOWN; +import static net.minecraft.core.Direction.EAST; +import static net.minecraft.core.Direction.NORTH; +import static net.minecraft.core.Direction.SOUTH; +import static net.minecraft.core.Direction.UP; +import static net.minecraft.core.Direction.WEST; public class DiagonalCableGenerator extends SpecialBlockStateGen { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlock.java index 66afdd47..89a58abe 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlock.java @@ -6,8 +6,6 @@ import com.drmangotea.tfmg.content.decoration.concrete.ConcreteloggedBlock; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.drmangotea.tfmg.registry.TFMGItems; -import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.foundation.block.IBE; import com.simibubi.create.foundation.placement.PoleHelper; import net.createmod.catnip.placement.IPlacementHelper; @@ -29,18 +27,13 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.RotatedPillarBlock; -import net.minecraft.world.level.block.SimpleWaterloggedBlock; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.material.FluidState; -import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraftforge.network.PacketDistributor; import java.util.function.Predicate; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlockEntity.java index 37318e4e..9228e645 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/connection/tube/CableTubeBlockEntity.java @@ -1,9 +1,7 @@ package com.drmangotea.tfmg.content.electricity.connection.tube; - import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; -import com.drmangotea.tfmg.registry.TFMGBlockEntities; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.block.entity.BlockEntityType; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/debug/DebugCinderBlockItem.java b/src/main/java/com/drmangotea/tfmg/content/electricity/debug/DebugCinderBlockItem.java index bfc929bd..402c3e31 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/debug/DebugCinderBlockItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/debug/DebugCinderBlockItem.java @@ -1,37 +1,13 @@ package com.drmangotea.tfmg.content.electricity.debug; import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.content.electricity.base.IElectric; -import com.drmangotea.tfmg.content.electricity.connection.cables.CableConnection; -import com.drmangotea.tfmg.content.electricity.connection.cables.CableConnectorBlockEntity; -import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; -import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerBlockEntity; -import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; -import com.drmangotea.tfmg.content.engines.types.large_engine.LargeEngineBlockEntity; -import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlockEntity; -import com.drmangotea.tfmg.content.machinery.metallurgy.blast_stove.BlastStoveBlockEntity; -import com.drmangotea.tfmg.content.machinery.metallurgy.casting_basin.CastingBasinBlockEntity; -import com.drmangotea.tfmg.content.machinery.metallurgy.coke_oven.CokeOvenBlockEntity; -import com.drmangotea.tfmg.content.machinery.misc.concrete_hose.ConcreteHoseBlockEntity; -import com.drmangotea.tfmg.content.machinery.oil_processing.pumpjack.pumpjack.base.FluidReservoir; -import com.drmangotea.tfmg.content.machinery.oil_processing.pumpjack.pumpjack.base.PumpjackBaseBlockEntity; -import com.drmangotea.tfmg.content.machinery.oil_processing.surface_scanner.SurfaceScannerBlockEntity; -import com.drmangotea.tfmg.content.machinery.vat.base.VatBlockEntity; -import com.drmangotea.tfmg.registry.TFMGFluids; -import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; -import com.simibubi.create.content.kinetics.mixer.MechanicalMixerBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionResult; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Blocks; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.IFluidHandler; - -import java.util.ArrayList; public class DebugCinderBlockItem extends Item { public DebugCinderBlockItem(Properties p_41383_) { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlock.java index 70afb455..e560fc5f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlock.java @@ -11,7 +11,6 @@ import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.DirectionalBlock; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.shapes.CollisionContext; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlockEntity.java index 3cf5c6c4..a0c8bfbe 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/GeneratorBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.electricity.generators; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.content.electricity.base.KineticElectricBlockEntity; import com.drmangotea.tfmg.registry.TFMGSoundEvents; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/creative_generator/CreativeGeneratorBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/creative_generator/CreativeGeneratorBlockEntity.java index 5f4db9e1..746b7595 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/creative_generator/CreativeGeneratorBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/creative_generator/CreativeGeneratorBlockEntity.java @@ -1,13 +1,10 @@ package com.drmangotea.tfmg.content.electricity.generators.creative_generator; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; import com.mojang.blaze3d.vertex.PoseStack; -import com.simibubi.create.Create; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; - import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorBlock.java index 168a4d99..aca1745c 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorBlock.java @@ -2,10 +2,8 @@ package com.drmangotea.tfmg.content.electricity.generators.large_generator; import com.drmangotea.tfmg.base.TFMGShapes; -import com.drmangotea.tfmg.content.electricity.base.ConnectNeightborsPacket; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock; import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; @@ -18,7 +16,6 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraftforge.network.PacketDistributor; public class RotorBlock extends RotatedPillarKineticBlock implements IBE { public RotorBlock(Properties properties) { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorBlockEntity.java index 68ec47f4..0840dda7 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorBlockEntity.java @@ -14,12 +14,22 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; import static com.drmangotea.tfmg.content.electricity.generators.large_generator.StatorBlock.STATOR_STATE; import static com.drmangotea.tfmg.content.electricity.generators.large_generator.StatorBlock.VALUE; import static com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock.AXIS; -import static net.minecraft.core.Direction.*; +import static net.minecraft.core.Direction.Axis; +import static net.minecraft.core.Direction.DOWN; +import static net.minecraft.core.Direction.EAST; +import static net.minecraft.core.Direction.NORTH; +import static net.minecraft.core.Direction.SOUTH; +import static net.minecraft.core.Direction.UP; +import static net.minecraft.core.Direction.WEST; import static net.minecraft.world.level.block.DirectionalBlock.FACING; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorRenderer.java b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorRenderer.java index c618a7c6..03885c9d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorRenderer.java @@ -11,11 +11,8 @@ import net.createmod.catnip.render.SuperByteBuffer; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; -import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; -import static com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock.AXIS; - public class RotorRenderer extends KineticBlockEntityRenderer { public RotorRenderer(BlockEntityRendererProvider.Context context) { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorVisual.java b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorVisual.java index edabc98b..03ff8d66 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorVisual.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/RotorVisual.java @@ -1,7 +1,5 @@ package com.drmangotea.tfmg.content.electricity.generators.large_generator; -import com.drmangotea.tfmg.content.decoration.flywheels.TFMGFlywheelBlock; -import com.drmangotea.tfmg.content.decoration.flywheels.TFMGFlywheelBlockEntity; import com.drmangotea.tfmg.registry.TFMGPartialModels; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/StatorBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/StatorBlock.java index 54816bf8..5af7f219 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/StatorBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/generators/large_generator/StatorBlock.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.content.electricity.generators.large_generator; import com.drmangotea.tfmg.base.TFMGShapes; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -19,7 +18,6 @@ import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.block.state.properties.EnumProperty; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraftforge.network.PacketDistributor; public class StatorBlock extends DirectionalBlock implements IBE { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/lights/neon_tube/NeonTubeBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/lights/neon_tube/NeonTubeBlock.java index 04bd6969..b02b266b 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/lights/neon_tube/NeonTubeBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/lights/neon_tube/NeonTubeBlock.java @@ -1,10 +1,8 @@ package com.drmangotea.tfmg.content.electricity.lights.neon_tube; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.content.electricity.connection.cables.SimplePos; import com.drmangotea.tfmg.content.electricity.lights.LightBulbBlock; -import com.drmangotea.tfmg.content.electricity.lights.LightBulbBlockEntity; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.simibubi.create.content.equipment.wrench.IWrenchable; @@ -28,7 +26,6 @@ import net.minecraft.world.level.block.PipeBlock; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/MultimeterOverlayRenderer.java b/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/MultimeterOverlayRenderer.java index 3bcb7133..f57a6667 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/MultimeterOverlayRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/MultimeterOverlayRenderer.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.electricity.measurement; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGItems; import com.mojang.blaze3d.platform.Window; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterBlock.java index 6a5d49f9..1c04ae90 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterBlock.java @@ -1,8 +1,8 @@ package com.drmangotea.tfmg.content.electricity.measurement; -import com.drmangotea.tfmg.base.blocks.TFMGHorizontalDirectionalBlock; import com.drmangotea.tfmg.base.TFMGShapes; +import com.drmangotea.tfmg.base.blocks.TFMGHorizontalDirectionalBlock; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.foundation.block.IBE; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterBlockEntity.java index 1c5e1e69..fe2d6f2e 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.electricity.measurement; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.content.electricity.storage.AccumulatorBlockEntity; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterRenderer.java b/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterRenderer.java index 71193fd3..7345fe15 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/measurement/VoltMeterRenderer.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.electricity.measurement; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.registry.TFMGPartialModels; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/storage/AccumulatorBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/storage/AccumulatorBlockEntity.java index b1810b03..0b6932a0 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/storage/AccumulatorBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/storage/AccumulatorBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.electricity.storage; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/storage/AccumulatorItem.java b/src/main/java/com/drmangotea/tfmg/content/electricity/storage/AccumulatorItem.java index 7993d8a5..0a6b9636 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/storage/AccumulatorItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/storage/AccumulatorItem.java @@ -1,14 +1,9 @@ package com.drmangotea.tfmg.content.electricity.storage; import com.drmangotea.tfmg.config.TFMGConfigs; -import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; -import net.minecraftforge.common.capabilities.ICapabilityProvider; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.energy.IEnergyStorage; -import org.jetbrains.annotations.Nullable; public class AccumulatorItem extends BlockItem { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterBlock.java index 812599e9..331c568a 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterBlock.java @@ -1,7 +1,7 @@ package com.drmangotea.tfmg.content.electricity.utilities.converter; -import com.drmangotea.tfmg.base.blocks.TFMGHorizontalDirectionalBlock; import com.drmangotea.tfmg.base.TFMGShapes; +import com.drmangotea.tfmg.base.blocks.TFMGHorizontalDirectionalBlock; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.simibubi.create.content.equipment.wrench.IWrenchable; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterBlockEntity.java index cbb1383f..715866a8 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterBlockEntity.java @@ -1,20 +1,16 @@ package com.drmangotea.tfmg.content.electricity.utilities.converter; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.content.electricity.storage.AccumulatorBlockEntity; import com.drmangotea.tfmg.content.electricity.storage.TFMGForgeEnergyStorage; -import com.drmangotea.tfmg.content.machinery.misc.winding_machine.WindingMachineBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; - import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.math.VecHelper; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -29,7 +25,6 @@ import net.minecraftforge.energy.IEnergyStorage; import org.jetbrains.annotations.NotNull; import javax.annotation.Nullable; - import java.util.List; import static com.drmangotea.tfmg.content.electricity.utilities.converter.ConverterBlock.INPUT; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterGenerator.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterGenerator.java index 575a734a..9defc09f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterGenerator.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterGenerator.java @@ -5,9 +5,7 @@ import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.RegistrateBlockstateProvider; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.HorizontalDirectionalBlock; -import net.minecraft.world.level.block.StairBlock; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.properties.Half; import net.minecraftforge.client.model.generators.ModelFile; import static com.simibubi.create.foundation.data.AssetLookup.partialBaseModel; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/diode/ElectricDiodeBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/diode/ElectricDiodeBlock.java index fa0f4bdb..5b240bc9 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/diode/ElectricDiodeBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/diode/ElectricDiodeBlock.java @@ -1,7 +1,7 @@ package com.drmangotea.tfmg.content.electricity.utilities.diode; -import com.drmangotea.tfmg.base.blocks.TFMGDirectionalBlock; import com.drmangotea.tfmg.base.TFMGShapes; +import com.drmangotea.tfmg.base.blocks.TFMGDirectionalBlock; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.content.electricity.base.IVoltageChanger; import com.drmangotea.tfmg.registry.TFMGBlockEntities; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_motor/ElectricMotorBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_motor/ElectricMotorBlockEntity.java index 8b74505e..f3827445 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_motor/ElectricMotorBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_motor/ElectricMotorBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.electricity.utilities.electric_motor; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.config.MachineConfig; import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.content.electricity.base.KineticElectricBlockEntity; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlock.java index e3467d87..f2d98a6e 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlock.java @@ -1,11 +1,7 @@ package com.drmangotea.tfmg.content.electricity.utilities.electric_pump; import com.drmangotea.tfmg.base.TFMGShapes; -import com.drmangotea.tfmg.content.electricity.base.ConnectNeightborsPacket; -import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; -import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.content.fluids.pump.PumpBlock; import com.simibubi.create.content.fluids.pump.PumpBlockEntity; import com.simibubi.create.foundation.block.IBE; @@ -16,7 +12,6 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraftforge.network.PacketDistributor; public class ElectricPumpBlock extends PumpBlock { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlockEntity.java index c672b32f..34392f66 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/electric_pump/ElectricPumpBlockEntity.java @@ -1,7 +1,13 @@ package com.drmangotea.tfmg.content.electricity.utilities.electric_pump; import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.content.electricity.base.*; +import com.drmangotea.tfmg.content.electricity.base.ElectricBlockValues; +import com.drmangotea.tfmg.content.electricity.base.ElectricNetworkManager; +import com.drmangotea.tfmg.content.electricity.base.ElectricalGroup; +import com.drmangotea.tfmg.content.electricity.base.ElectricalNetwork; +import com.drmangotea.tfmg.content.electricity.base.IElectric; +import com.drmangotea.tfmg.content.electricity.base.NetworkUpdatePacket; +import com.drmangotea.tfmg.content.electricity.base.VoltageAlteringBlockEntity; import com.drmangotea.tfmg.registry.TFMGPackets; import com.simibubi.create.content.fluids.FluidPropagator; import com.simibubi.create.content.fluids.FluidTransportBehaviour; @@ -17,7 +23,6 @@ import net.createmod.catnip.math.BlockFace; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.chat.Component; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.entity.BlockEntity; @@ -28,7 +33,13 @@ import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.network.PacketDistributor; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import static com.simibubi.create.content.kinetics.base.DirectionalKineticBlock.FACING; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/fuse_block/FuseBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/fuse_block/FuseBlock.java index b339e505..862f9cf7 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/fuse_block/FuseBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/fuse_block/FuseBlock.java @@ -4,13 +4,11 @@ import com.drmangotea.tfmg.base.blocks.TFMGHorizontalDirectionalBlock; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.content.electricity.base.IVoltageChanger; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockBehaviour; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/fuse_block/FuseBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/fuse_block/FuseBlockEntity.java index 1621ea36..c5dd64f5 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/fuse_block/FuseBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/fuse_block/FuseBlockEntity.java @@ -1,14 +1,10 @@ package com.drmangotea.tfmg.content.electricity.utilities.fuse_block; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.content.electricity.base.UpdateInFrontPacket; import com.drmangotea.tfmg.content.electricity.utilities.diode.ElectricDiodeBlockEntity; import com.drmangotea.tfmg.registry.TFMGPackets; - -import com.simibubi.create.foundation.utility.CreateLang; -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -17,7 +13,6 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.DirectionalBlock; -import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.network.PacketDistributor; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/fuse_block/FuseBlockRenderer.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/fuse_block/FuseBlockRenderer.java index 1c7ddb62..cb384802 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/fuse_block/FuseBlockRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/fuse_block/FuseBlockRenderer.java @@ -7,10 +7,8 @@ import net.createmod.catnip.render.CachedBuffers; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; -import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.BlockState; -import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING; import static net.minecraft.world.level.block.HorizontalDirectionalBlock.FACING; public class FuseBlockRenderer extends SafeBlockEntityRenderer { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizeByLightningEvent.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizeByLightningEvent.java index 20297d77..1e151bb3 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizeByLightningEvent.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizeByLightningEvent.java @@ -1,17 +1,12 @@ package com.drmangotea.tfmg.content.electricity.utilities.polarizer; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.registry.TFMGItems; -import net.minecraft.core.BlockPos; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; -import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.event.entity.EntityStruckByLightningEvent; -import net.minecraftforge.eventbus.api.Event; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; -import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus; @EventBusSubscriber public class PolarizeByLightningEvent { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlock.java index bc97eb28..2c34a7e3 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlock.java @@ -1,7 +1,7 @@ package com.drmangotea.tfmg.content.electricity.utilities.polarizer; -import com.drmangotea.tfmg.base.blocks.TFMGHorizontalDirectionalBlock; import com.drmangotea.tfmg.base.TFMGShapes; +import com.drmangotea.tfmg.base.blocks.TFMGHorizontalDirectionalBlock; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.simibubi.create.foundation.block.IBE; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlockEntity.java index 9a453d0d..a7625caf 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.electricity.utilities.polarizer; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; @@ -9,7 +8,6 @@ import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipe; import com.simibubi.create.foundation.item.SmartInventory; - import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.animation.LerpedFloat; import net.minecraft.ChatFormatting; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerRenderer.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerRenderer.java index b3ec8eb1..e57015d3 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/polarizer/PolarizerRenderer.java @@ -17,7 +17,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.state.BlockState; -import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING; import static net.minecraft.world.level.block.HorizontalDirectionalBlock.FACING; public class PolarizerRenderer extends SafeBlockEntityRenderer { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/potentiometer/PotentiometerBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/potentiometer/PotentiometerBlock.java index 4ac55e1d..ad1ad4b0 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/potentiometer/PotentiometerBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/potentiometer/PotentiometerBlock.java @@ -1,7 +1,7 @@ package com.drmangotea.tfmg.content.electricity.utilities.potentiometer; -import com.drmangotea.tfmg.base.blocks.TFMGDirectionalBlock; import com.drmangotea.tfmg.base.TFMGShapes; +import com.drmangotea.tfmg.base.blocks.TFMGDirectionalBlock; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.content.electricity.base.IVoltageChanger; import com.drmangotea.tfmg.registry.TFMGBlockEntities; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorBlockEntity.java index cad4a8c0..2881b8dc 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.electricity.utilities.resistor; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorItem.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorItem.java index b05c3482..3bbf112b 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/resistor/ResistorItem.java @@ -4,12 +4,10 @@ package com.drmangotea.tfmg.content.electricity.utilities.resistor; import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; -import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.Block; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/segmented_display/SegmentedDisplayRenderer.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/segmented_display/SegmentedDisplayRenderer.java index fb331a57..d5f93074 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/segmented_display/SegmentedDisplayRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/segmented_display/SegmentedDisplayRenderer.java @@ -1,12 +1,9 @@ package com.drmangotea.tfmg.content.electricity.utilities.segmented_display; import com.drmangotea.tfmg.registry.TFMGPartialModels; - - import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; - import dev.engine_room.flywheel.lib.model.baked.PartialModel; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.render.CachedBuffers; @@ -16,7 +13,11 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.state.BlockState; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class SegmentedDisplayRenderer extends SafeBlockEntityRenderer { diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TimerScrollBehaviour.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TimerScrollBehaviour.java index 2386e87f..e91bd543 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TimerScrollBehaviour.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TimerScrollBehaviour.java @@ -5,7 +5,6 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsBoard; import com.simibubi.create.foundation.blockEntity.behaviour.ValueSettingsFormatter; import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; - import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightBlock.java index 5097f92f..9e8fe9a1 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightBlock.java @@ -1,8 +1,8 @@ package com.drmangotea.tfmg.content.electricity.utilities.traffic_light; -import com.drmangotea.tfmg.base.blocks.TFMGHorizontalDirectionalBlock; import com.drmangotea.tfmg.base.TFMGShapes; +import com.drmangotea.tfmg.base.blocks.TFMGHorizontalDirectionalBlock; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.simibubi.create.foundation.block.IBE; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightBlockEntity.java index eca5f1c3..e46c5232 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightBlockEntity.java @@ -1,10 +1,8 @@ package com.drmangotea.tfmg.content.electricity.utilities.traffic_light; import com.drmangotea.tfmg.content.electricity.base.ElectricBlockEntity; -import com.simibubi.create.Create; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; - import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.animation.LerpedFloat; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightRenderer.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightRenderer.java index 15da0f60..1e3771f3 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/traffic_light/TrafficLightRenderer.java @@ -2,12 +2,11 @@ package com.drmangotea.tfmg.content.electricity.utilities.traffic_light; import com.drmangotea.tfmg.registry.TFMGPartialModels; - import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer; +import com.simibubi.create.foundation.render.RenderTypes; import dev.engine_room.flywheel.lib.transform.TransformStack; import net.createmod.catnip.render.CachedBuffers; -import com.simibubi.create.foundation.render.RenderTypes; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.world.level.block.HorizontalDirectionalBlock; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/transformer/TransformerBlock.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/transformer/TransformerBlock.java index cbca6285..af170df2 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/transformer/TransformerBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/transformer/TransformerBlock.java @@ -1,7 +1,7 @@ package com.drmangotea.tfmg.content.electricity.utilities.transformer; -import com.drmangotea.tfmg.base.blocks.TFMGHorizontalDirectionalBlock; import com.drmangotea.tfmg.base.TFMGShapes; +import com.drmangotea.tfmg.base.blocks.TFMGHorizontalDirectionalBlock; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.content.electricity.base.IVoltageChanger; import com.drmangotea.tfmg.registry.TFMGBlockEntities; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/transformer/TransformerBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/transformer/TransformerBlockEntity.java index a56c5c44..7229b235 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/transformer/TransformerBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/transformer/TransformerBlockEntity.java @@ -1,12 +1,9 @@ package com.drmangotea.tfmg.content.electricity.utilities.transformer; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.blocks.TFMGHorizontalDirectionalBlock; -import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.drmangotea.tfmg.content.electricity.base.UpdateInFrontPacket; import com.drmangotea.tfmg.content.electricity.base.VoltageAlteringBlockEntity; - import com.drmangotea.tfmg.registry.TFMGPackets; import com.drmangotea.tfmg.registry.TFMGSoundEvents; import com.simibubi.create.foundation.utility.CreateLang; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/FluidContainingItem.java b/src/main/java/com/drmangotea/tfmg/content/engines/FluidContainingItem.java index cbb43af7..6123dd12 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/FluidContainingItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/FluidContainingItem.java @@ -1,9 +1,6 @@ package com.drmangotea.tfmg.content.engines; -import com.drmangotea.tfmg.content.items.weapons.flamethrover.FlamethrowerItem; -import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; - import com.simibubi.create.foundation.utility.CreateLang; import com.tterrag.registrate.util.entry.FluidEntry; import net.minecraft.ChatFormatting; @@ -20,7 +17,6 @@ import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.Level; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; import java.util.List; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/base/AbstractEngineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/engines/base/AbstractEngineBlockEntity.java index cc893a2e..c61a2c36 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/base/AbstractEngineBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/base/AbstractEngineBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.engines.base; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.content.electricity.base.KineticElectricBlockEntity; import com.drmangotea.tfmg.content.engines.fuels.BaseFuelTypes; @@ -9,7 +8,6 @@ import com.drmangotea.tfmg.content.engines.fuels.FuelType; import com.drmangotea.tfmg.registry.TFMGFluids; import com.drmangotea.tfmg.registry.TFMGTags; import com.simibubi.create.foundation.fluid.CombinedTankWrapper; -import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -35,9 +33,6 @@ import javax.annotation.Nullable; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import static com.drmangotea.tfmg.content.engines.base.EngineBlock.ENGINE_STATE; -import static com.drmangotea.tfmg.content.engines.base.EngineBlock.EngineState.SHAFT; - public abstract class AbstractEngineBlockEntity extends KineticElectricBlockEntity { // diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineFluidTank.java b/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineFluidTank.java index 0958e193..24d7dfde 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineFluidTank.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineFluidTank.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.engines.base; -import com.drmangotea.tfmg.TFMG; import com.simibubi.create.foundation.fluid.SmartFluidTank; import net.minecraft.tags.TagKey; import net.minecraft.world.level.material.Fluid; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineRenderer.java b/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineRenderer.java index 0a7e432d..044333fd 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/base/EngineRenderer.java @@ -7,7 +7,6 @@ import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerBlockEntity.java index fa072516..3d8dc2d0 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerBlockEntity.java @@ -1,13 +1,11 @@ package com.drmangotea.tfmg.content.engines.engine_controller; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; import com.drmangotea.tfmg.content.engines.upgrades.TransmissionUpgrade; import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; import com.simibubi.create.content.redstone.link.RedstoneLinkNetworkHandler; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import com.simibubi.create.foundation.utility.CreateLang; import net.createmod.catnip.animation.LerpedFloat; import net.createmod.catnip.data.Couple; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerClientHandler.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerClientHandler.java index 83dd500c..da93650c 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerClientHandler.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerClientHandler.java @@ -1,16 +1,19 @@ package com.drmangotea.tfmg.content.engines.engine_controller; -import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.content.engines.engine_controller.packets.*; +import com.drmangotea.tfmg.content.engines.engine_controller.packets.EngineControllerBindPacket; +import com.drmangotea.tfmg.content.engines.engine_controller.packets.EngineControllerInputPacket; +import com.drmangotea.tfmg.content.engines.engine_controller.packets.EngineControllerStopControllerPacket; +import com.drmangotea.tfmg.content.engines.engine_controller.packets.EngineStartPacket; +import com.drmangotea.tfmg.content.engines.engine_controller.packets.TransmissionShiftPacket; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGKeys; import com.drmangotea.tfmg.registry.TFMGPackets; import com.mojang.blaze3d.platform.InputConstants; -import com.simibubi.create.*; +import com.simibubi.create.AllItems; +import com.simibubi.create.AllSoundEvents; import com.simibubi.create.content.redstone.link.LinkBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.utility.ControlsUtil; - import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; @@ -21,7 +24,9 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.shapes.VoxelShape; import org.lwjgl.glfw.GLFW; -import java.util.*; +import java.util.Collection; +import java.util.HashSet; +import java.util.Vector; public class EngineControllerClientHandler { //public static final IGuiOverlay OVERLAY = LinkedControllerClientHandler::renderOverlay; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerMenu.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerMenu.java index 8bcf915d..abda88c3 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerMenu.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerMenu.java @@ -1,20 +1,15 @@ package com.drmangotea.tfmg.content.engines.engine_controller; import com.drmangotea.tfmg.registry.TFMGMenuTypes; -import com.simibubi.create.AllMenuTypes; - import com.simibubi.create.foundation.gui.menu.GhostItemMenu; -import com.simibubi.create.foundation.gui.menu.MenuBase; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.ClickType; import net.minecraft.world.inventory.MenuType; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerScreen.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerScreen.java index 1f341a03..b3720684 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerScreen.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/EngineControllerScreen.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.content.engines.engine_controller; import com.drmangotea.tfmg.registry.TFMGGuiTextures; import com.google.common.collect.ImmutableList; -import com.simibubi.create.foundation.gui.AllGuiTextures; import com.simibubi.create.foundation.gui.AllIcons; import com.simibubi.create.foundation.gui.menu.AbstractSimiContainerScreen; import com.simibubi.create.foundation.gui.widget.IconButton; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerBindPacket.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerBindPacket.java index 60305651..97d7cd40 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerBindPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerBindPacket.java @@ -1,15 +1,9 @@ package com.drmangotea.tfmg.content.engines.engine_controller.packets; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerBlockEntity; -import com.simibubi.create.content.redstone.link.LinkBehaviour; -import com.simibubi.create.content.redstone.link.controller.LecternControllerBlockEntity; -import com.simibubi.create.content.redstone.link.controller.LinkedControllerItem; -import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.items.ItemStackHandler; public class EngineControllerBindPacket extends EngineControllerPacketBase { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerInputPacket.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerInputPacket.java index 9a9156fe..410c3628 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerInputPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerInputPacket.java @@ -1,20 +1,18 @@ package com.drmangotea.tfmg.content.engines.engine_controller.packets; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerBlockEntity; import com.simibubi.create.content.redstone.link.RedstoneLinkNetworkHandler; -import com.simibubi.create.content.redstone.link.controller.LecternControllerBlockEntity; -import com.simibubi.create.content.redstone.link.controller.LinkedControllerItem; import com.simibubi.create.content.redstone.link.controller.LinkedControllerServerHandler; import net.createmod.catnip.data.Couple; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.UUID; public class EngineControllerInputPacket extends EngineControllerPacketBase { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerPacketBase.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerPacketBase.java index ba4c8565..f006e310 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerPacketBase.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerPacketBase.java @@ -1,12 +1,10 @@ package com.drmangotea.tfmg.content.engines.engine_controller.packets; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerBlockEntity; -import com.simibubi.create.AllItems; import com.simibubi.create.foundation.networking.SimplePacketBase; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraftforge.network.NetworkEvent.Context; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerStopControllerPacket.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerStopControllerPacket.java index 3eb604f6..7ba3695c 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerStopControllerPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineControllerStopControllerPacket.java @@ -1,11 +1,9 @@ package com.drmangotea.tfmg.content.engines.engine_controller.packets; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.item.ItemStack; public class EngineControllerStopControllerPacket extends EngineControllerPacketBase { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineStartPacket.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineStartPacket.java index 2305e185..f46cd6b4 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineStartPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/EngineStartPacket.java @@ -1,14 +1,10 @@ package com.drmangotea.tfmg.content.engines.engine_controller.packets; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.server.level.ServerPlayer; -import java.util.ArrayList; -import java.util.Collection; - public class EngineStartPacket extends EngineControllerPacketBase { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/TransmissionShiftPacket.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/TransmissionShiftPacket.java index 7ce668cb..7969692b 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/TransmissionShiftPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_controller/packets/TransmissionShiftPacket.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.engines.engine_controller.packets; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerBlockEntity; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxBlock.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxBlock.java index e0b0bed1..84469dd8 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxBlock.java @@ -9,7 +9,6 @@ import net.minecraft.core.Direction; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.shapes.CollisionContext; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxRenderer.java b/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxRenderer.java index 72ccffe2..fb57367d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/engine_gearbox/EngineGearboxRenderer.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.engines.engine_gearbox; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; -import com.simibubi.create.content.kinetics.gearbox.GearboxBlockEntity; import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider; public class EngineGearboxRenderer extends KineticBlockEntityRenderer { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/fuels/EngineFuelTypeManager.java b/src/main/java/com/drmangotea/tfmg/content/engines/fuels/EngineFuelTypeManager.java index ec81c588..a344272f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/fuels/EngineFuelTypeManager.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/fuels/EngineFuelTypeManager.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.IdentityHashMap; import java.util.Map; import java.util.Optional; -import java.util.function.Supplier; public class EngineFuelTypeManager { public static final Map BUILTIN_TYPE_MAP = new HashMap<>(); diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/fuels/FuelType.java b/src/main/java/com/drmangotea/tfmg/content/engines/fuels/FuelType.java index 07e84dfc..cd2bca59 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/fuels/FuelType.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/fuels/FuelType.java @@ -4,20 +4,14 @@ import com.drmangotea.tfmg.registry.TFMGTags; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; -import net.minecraft.ResourceLocationException; -import net.minecraft.core.Holder; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.level.material.Fluid; import net.minecraftforge.registries.ForgeRegistries; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; import java.util.function.Consumer; import java.util.function.Predicate; -import java.util.function.Supplier; import static com.drmangotea.tfmg.registry.TFMGTags.optionalTag; @@ -53,7 +47,7 @@ public class FuelType { public static FuelType fromJson(JsonObject object) { FuelType type = new FuelType(); try { - parseJsonPrimitive(object, "fluid", JsonPrimitive::isString, primitive -> type.fluid = optionalTag(ForgeRegistries.FLUIDS,new ResourceLocation(primitive.getAsString()))); + parseJsonPrimitive(object, "fluid", JsonPrimitive::isString, primitive -> type.fluid = optionalTag(ForgeRegistries.FLUIDS, ResourceLocation.fromNamespaceAndPath("", primitive.getAsString()))); parseJsonPrimitive(object, "speed", JsonPrimitive::isNumber, primitive -> type.speed = primitive.getAsFloat()); parseJsonPrimitive(object, "efficiency", JsonPrimitive::isNumber, primitive -> type.efficiency = primitive.getAsFloat()); diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/AbstractSmallEngineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/AbstractSmallEngineBlockEntity.java index e07fa51b..8d6f81e5 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/AbstractSmallEngineBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/AbstractSmallEngineBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.engines.types; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; import com.drmangotea.tfmg.content.engines.base.EngineBlock; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/large_engine/LargeEngineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/large_engine/LargeEngineBlockEntity.java index b00dc560..d097f495 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/large_engine/LargeEngineBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/large_engine/LargeEngineBlockEntity.java @@ -8,7 +8,6 @@ import com.drmangotea.tfmg.content.engines.base.EngineFluidTank; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGSoundEvents; import com.drmangotea.tfmg.registry.TFMGTags; -import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; import com.simibubi.create.content.kinetics.belt.behaviour.DirectBeltInputBehaviour; import com.simibubi.create.content.kinetics.steamEngine.PoweredShaftBlockEntity; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlock.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlock.java index fe4854f1..1df2b0ad 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlock.java @@ -4,7 +4,6 @@ import com.drmangotea.tfmg.base.TFMGShapes; import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlock; import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.BlockGetter; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlockEntity.java index 38b02e35..0e3dcfbc 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/radial_engine/RadialEngineBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.engines.types.radial_engine; -import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlockEntity; import net.minecraft.core.BlockPos; @@ -10,9 +9,11 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import static com.drmangotea.tfmg.content.engines.base.EngineBlock.ENGINE_STATE; -import static com.drmangotea.tfmg.content.engines.base.EngineBlock.EngineState.*; +import static com.drmangotea.tfmg.content.engines.base.EngineBlock.EngineState.BACK; +import static com.drmangotea.tfmg.content.engines.base.EngineBlock.EngineState.NORMAL; +import static com.drmangotea.tfmg.content.engines.base.EngineBlock.EngineState.SHAFT; +import static com.drmangotea.tfmg.content.engines.base.EngineBlock.EngineState.SINGLE; import static com.drmangotea.tfmg.content.engines.base.EngineBlock.SHAFT_FACING; -import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING; public class RadialEngineBlockEntity extends RegularEngineBlockEntity { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlock.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlock.java index f2afc3ea..17e8eac1 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlock.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.engines.types.regular_engine; import com.drmangotea.tfmg.content.electricity.base.IElectric; -import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; import com.drmangotea.tfmg.content.engines.base.EngineBlock; import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGBlockEntities; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlockEntity.java index 272f676e..b5cda283 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.engines.types.regular_engine; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; @@ -17,6 +16,7 @@ import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.FluidTags; import net.minecraft.tags.TagKey; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; @@ -27,14 +27,18 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Fluid; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.registries.ForgeRegistries; import java.util.ArrayList; import java.util.List; -import static com.drmangotea.tfmg.content.engines.base.EngineProperties.*; +import static com.drmangotea.tfmg.content.engines.base.EngineProperties.pistonsBoxer; +import static com.drmangotea.tfmg.content.engines.base.EngineProperties.pistonsI; +import static com.drmangotea.tfmg.content.engines.base.EngineProperties.pistonsRadial; +import static com.drmangotea.tfmg.content.engines.base.EngineProperties.pistonsTurbine; +import static com.drmangotea.tfmg.content.engines.base.EngineProperties.pistonsU; +import static com.drmangotea.tfmg.content.engines.base.EngineProperties.pistonsV; +import static com.drmangotea.tfmg.content.engines.base.EngineProperties.pistonsW; import static com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlock.EXTENDED; -import static com.drmangotea.tfmg.registry.TFMGTags.optionalTag; import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING; public class RegularEngineBlockEntity extends AbstractSmallEngineBlockEntity { @@ -88,7 +92,7 @@ public class RegularEngineBlockEntity extends AbstractSmallEngineBlockEntity { String id = fuelsToAllow.getString(key); - TagKey tag = optionalTag(ForgeRegistries.FLUIDS, new ResourceLocation(id)); + TagKey tag = FluidTags.create(ResourceLocation.fromNamespaceAndPath("forge", id.replace("forge:", ""))); fuelsFound.add(tag); } diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineRenderer.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineRenderer.java index 462db710..c520aa24 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineRenderer.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.engines.types.regular_engine; -import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; import com.drmangotea.tfmg.content.engines.base.EngineRenderer; import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; import com.drmangotea.tfmg.content.engines.types.turbine_engine.TurbineEngineBlockEntity; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineVisual.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineVisual.java index 48ec4d8f..771fcd88 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineVisual.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/regular_engine/RegularEngineVisual.java @@ -1,14 +1,10 @@ package com.drmangotea.tfmg.content.engines.types.regular_engine; -import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; -import com.drmangotea.tfmg.content.engines.base.EngineBlock; import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; -import com.drmangotea.tfmg.content.machinery.vat.industrial_mixer.IndustrialMixerBlockEntity; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.IRotate; import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; import com.simibubi.create.content.kinetics.base.RotatingInstance; -import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockEntityRenderer; import com.simibubi.create.foundation.render.AllInstanceTypes; import dev.engine_room.flywheel.api.instance.Instance; import dev.engine_room.flywheel.api.visualization.VisualizationContext; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlock.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlock.java index 83df5d90..c9c24a9f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlock.java @@ -1,16 +1,12 @@ package com.drmangotea.tfmg.content.engines.types.turbine_engine; import com.drmangotea.tfmg.base.TFMGShapes; -import com.drmangotea.tfmg.content.electricity.base.IElectric; -import com.drmangotea.tfmg.content.engines.base.EngineBlock; import com.drmangotea.tfmg.content.engines.types.radial_engine.RadialEngineBlock; import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlockEntity.java index 7a5850f9..72228f4b 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineBlockEntity.java @@ -1,33 +1,22 @@ package com.drmangotea.tfmg.content.engines.types.turbine_engine; -import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; import com.drmangotea.tfmg.content.engines.base.EngineComponentsInventory; import com.drmangotea.tfmg.content.engines.base.EngineProperties; import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; -import com.drmangotea.tfmg.content.engines.types.radial_engine.RadialEngineBlockEntity; import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGItems; -import com.drmangotea.tfmg.registry.TFMGTags; -import com.simibubi.create.foundation.item.SmartInventory; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.tags.TagKey; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.phys.AABB; - -import java.util.ArrayList; -import java.util.List; import static com.drmangotea.tfmg.content.engines.base.EngineBlock.ENGINE_STATE; -import static com.drmangotea.tfmg.content.engines.base.EngineBlock.EngineState.*; +import static com.drmangotea.tfmg.content.engines.base.EngineBlock.EngineState.BACK; +import static com.drmangotea.tfmg.content.engines.base.EngineBlock.EngineState.NORMAL; +import static com.drmangotea.tfmg.content.engines.base.EngineBlock.EngineState.SHAFT; +import static com.drmangotea.tfmg.content.engines.base.EngineBlock.EngineState.SINGLE; import static com.drmangotea.tfmg.content.engines.base.EngineBlock.SHAFT_FACING; -import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING; public class TurbineEngineBlockEntity extends RegularEngineBlockEntity { public TurbineEngineBlockEntity(BlockEntityType typeIn, BlockPos pos, BlockState state) { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineGenerator.java b/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineGenerator.java index eccfc68c..971b40d7 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineGenerator.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/types/turbine_engine/TurbineEngineGenerator.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.engines.types.turbine_engine; - import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.engines.base.EngineBlock; import com.simibubi.create.foundation.data.SpecialBlockStateGen; @@ -12,7 +11,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.client.model.generators.ModelFile; import static com.drmangotea.tfmg.content.engines.base.EngineBlock.ENGINE_STATE; -import static com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlock.EXTENDED; public class TurbineEngineGenerator extends SpecialBlockStateGen { diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/EnginePipingUpgrade.java b/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/EnginePipingUpgrade.java index 09479bc2..bfaa2b9d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/EnginePipingUpgrade.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/EnginePipingUpgrade.java @@ -1,8 +1,6 @@ package com.drmangotea.tfmg.content.engines.upgrades; -import com.drmangotea.tfmg.TFMG; - import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/GoldenTurboUpgradeData.java b/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/GoldenTurboUpgradeData.java index 4d069742..00805dd8 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/GoldenTurboUpgradeData.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/GoldenTurboUpgradeData.java @@ -4,10 +4,10 @@ import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGItems; import com.drmangotea.tfmg.registry.TFMGPartialModels; -import dev.engine_room.flywheel.lib.model.baked.PartialModel; import com.mojang.blaze3d.vertex.PoseStack; -import net.createmod.catnip.render.CachedBuffers; +import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.render.CachedBuffers; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.Direction; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TransmissionUpgrade.java b/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TransmissionUpgrade.java index eca2cc1e..9e6a328d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TransmissionUpgrade.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TransmissionUpgrade.java @@ -9,7 +9,6 @@ import net.createmod.catnip.render.CachedBuffers; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; import net.minecraft.core.Direction; -import net.minecraft.nbt.CompoundTag; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TurboUpgradeData.java b/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TurboUpgradeData.java index 16a9af04..1e6e267f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TurboUpgradeData.java +++ b/src/main/java/com/drmangotea/tfmg/content/engines/upgrades/TurboUpgradeData.java @@ -4,10 +4,10 @@ import com.drmangotea.tfmg.content.engines.types.AbstractSmallEngineBlockEntity; import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGItems; import com.drmangotea.tfmg.registry.TFMGPartialModels; -import dev.engine_room.flywheel.lib.model.baked.PartialModel; import com.mojang.blaze3d.vertex.PoseStack; -import net.createmod.catnip.render.CachedBuffers; +import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.render.CachedBuffers; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonItem.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonItem.java index 0b6764e1..692908bf 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonItem.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.items.weapons.advanced_potato_cannon; - import com.drmangotea.tfmg.TFMGClient; import com.drmangotea.tfmg.content.items.weapons.advanced_potato_cannon.projectile.NapalmPotato; import com.drmangotea.tfmg.registry.TFMGEntityTypes; @@ -13,10 +12,8 @@ import com.simibubi.create.content.equipment.zapper.ShootableGadgetItemMethods; import com.simibubi.create.foundation.item.CustomArmPoseItem; import com.simibubi.create.foundation.item.render.SimpleCustomRenderer; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel.ArmPose; import net.minecraft.client.player.AbstractClientPlayer; -import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.BlockPos; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonPacket.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonPacket.java index bdbf296d..fde5a48d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonPacket.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.items.weapons.advanced_potato_cannon; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.TFMGClient; import com.simibubi.create.content.equipment.zapper.ShootGadgetPacket; import com.simibubi.create.content.equipment.zapper.ShootableGadgetRenderHandler; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonRenderHandler.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonRenderHandler.java index 0423bef0..f859143b 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonRenderHandler.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/advanced_potato_cannon/AdvancedPotatoCannonRenderHandler.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.items.weapons.advanced_potato_cannon; -import com.drmangotea.tfmg.registry.TFMGItems; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.content.equipment.potatoCannon.PotatoProjectileEntity; import com.simibubi.create.content.equipment.zapper.ShootableGadgetRenderHandler; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/napalm/NapalmBombEntity.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/napalm/NapalmBombEntity.java index 12da27ba..f2c827b2 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/napalm/NapalmBombEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/napalm/NapalmBombEntity.java @@ -12,7 +12,12 @@ import net.minecraft.network.protocol.game.ClientboundAddEntityPacket; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; import net.minecraft.network.syncher.SynchedEntityData; -import net.minecraft.world.entity.*; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.EntityDimensions; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.MoverType; +import net.minecraft.world.entity.Pose; import net.minecraft.world.entity.item.PrimedTnt; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/ThermiteGrenadeRenderer.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/ThermiteGrenadeRenderer.java index 0d56525f..931ac471 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/ThermiteGrenadeRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/ThermiteGrenadeRenderer.java @@ -15,7 +15,6 @@ import net.minecraft.world.item.ItemDisplayContext; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; - import static com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.ThermiteGrenade.ChemicalColor; @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/fire/BlueFireBlock.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/fire/BlueFireBlock.java index caeabad0..f81cccf4 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/fire/BlueFireBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/fire/BlueFireBlock.java @@ -10,7 +10,11 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.BiomeTags; import net.minecraft.util.RandomSource; import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.*; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.GameRules; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.BaseFireBlock; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/fire/GreenFireBlock.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/fire/GreenFireBlock.java index a91af122..86a86216 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/fire/GreenFireBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/fire/GreenFireBlock.java @@ -10,7 +10,11 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.tags.BiomeTags; import net.minecraft.util.RandomSource; import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.*; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.GameRules; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.BaseFireBlock; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/fire/LithiumFireBlock.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/fire/LithiumFireBlock.java index 5436055d..9b84764e 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/fire/LithiumFireBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/explosives/thermite_grenades/fire/LithiumFireBlock.java @@ -14,7 +14,11 @@ import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.*; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.GameRules; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.BaseFireBlock; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/fire_extinguisher/FireExtinguisherRenderHandler.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/fire_extinguisher/FireExtinguisherRenderHandler.java index 7e653a7e..393e0281 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/fire_extinguisher/FireExtinguisherRenderHandler.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/fire_extinguisher/FireExtinguisherRenderHandler.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.items.weapons.fire_extinguisher; -import com.drmangotea.tfmg.content.items.weapons.flamethrover.FlamethrowerItem; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.content.equipment.potatoCannon.PotatoProjectileEntity; import com.simibubi.create.content.equipment.zapper.ShootableGadgetRenderHandler; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerItem.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerItem.java index a19af013..5fdd9ab6 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/flamethrover/FlamethrowerItem.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.content.items.weapons.flamethrover; import com.drmangotea.tfmg.TFMGClient; import com.drmangotea.tfmg.base.spark.Spark; import com.drmangotea.tfmg.registry.TFMGEntityTypes; -import com.simibubi.create.api.equipment.potatoCannon.PotatoCannonProjectileType; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import com.simibubi.create.foundation.item.CustomArmPoseItem; import net.minecraft.client.model.HumanoidModel; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonItem.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonItem.java index d3268b9c..a0cc2bab 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonItem.java @@ -1,9 +1,6 @@ package com.drmangotea.tfmg.content.items.weapons.quad_potato_cannon; - - - import com.simibubi.create.AllEnchantments; import com.simibubi.create.AllEntityTypes; import com.simibubi.create.CreateClient; @@ -41,7 +38,6 @@ import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.UseAnim; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.item.enchantment.Enchantment; -import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonItemRenderer.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonItemRenderer.java index c361bcae..ce285e36 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonItemRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonItemRenderer.java @@ -4,7 +4,6 @@ package com.drmangotea.tfmg.content.items.weapons.quad_potato_cannon; import com.drmangotea.tfmg.TFMGClient; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; -import com.simibubi.create.content.equipment.potatoCannon.PotatoCannonItem; import com.simibubi.create.foundation.item.render.CustomRenderedItemModel; import com.simibubi.create.foundation.item.render.CustomRenderedItemModelRenderer; import com.simibubi.create.foundation.item.render.PartialItemModelRenderer; diff --git a/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonRenderHandler.java b/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonRenderHandler.java index 67946b33..4e5f2154 100644 --- a/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonRenderHandler.java +++ b/src/main/java/com/drmangotea/tfmg/content/items/weapons/quad_potato_cannon/QuadPotatoCannonRenderHandler.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.items.weapons.quad_potato_cannon; -import com.drmangotea.tfmg.registry.TFMGItems; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.content.equipment.potatoCannon.PotatoProjectileEntity; import com.simibubi.create.content.equipment.zapper.ShootableGadgetRenderHandler; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceHatchBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceHatchBlockEntity.java index 2930e224..d66c78c6 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceHatchBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceHatchBlockEntity.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.machinery.metallurgy.blast_furnace; import com.drmangotea.tfmg.base.TFMGUtils; -import com.drmangotea.tfmg.registry.TFMGFluids; import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceOutputBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceOutputBlockEntity.java index e27c8523..848145a2 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceOutputBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_furnace/BlastFurnaceOutputBlockEntity.java @@ -29,7 +29,6 @@ import net.minecraft.sounds.SoundEvents; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlock.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlock.java index f55c0161..59fabae5 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlock.java @@ -4,41 +4,13 @@ package com.drmangotea.tfmg.content.machinery.metallurgy.blast_stove; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.simibubi.create.api.connectivity.ConnectivityHandler; import com.simibubi.create.content.equipment.wrench.IWrenchable; -import com.simibubi.create.content.fluids.transfer.GenericItemEmptying; -import com.simibubi.create.content.fluids.transfer.GenericItemFilling; import com.simibubi.create.foundation.block.IBE; -import com.simibubi.create.foundation.fluid.FluidHelper; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.core.particles.BlockParticleOption; -import net.minecraft.core.particles.ParticleTypes; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.sounds.SoundSource; -import net.minecraft.util.Mth; -import net.minecraft.world.InteractionHand; -import net.minecraft.world.InteractionResult; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.context.UseOnContext; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.BooleanProperty; -import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.phys.BlockHitResult; -import net.minecraft.world.phys.Vec3; -import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.Shapes; -import net.minecraft.world.phys.shapes.VoxelShape; -import net.minecraftforge.common.capabilities.ForgeCapabilities; -import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.IFluidHandler; public class BlastStoveBlock extends Block implements IWrenchable, IBE { diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlockEntity.java index 5ed8a9e0..accb86c2 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlockEntity.java @@ -1,22 +1,14 @@ package com.drmangotea.tfmg.content.machinery.metallurgy.blast_stove; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; -import com.drmangotea.tfmg.content.decoration.pipes.TFMGPipeBlockEntity; -import com.drmangotea.tfmg.recipes.DistillationRecipe; import com.drmangotea.tfmg.recipes.HotBlastRecipe; -import com.drmangotea.tfmg.registry.TFMGFluids; -import com.simibubi.create.Create; import com.simibubi.create.api.connectivity.ConnectivityHandler; import com.simibubi.create.api.equipment.goggles.IHaveGoggleInformation; -import com.simibubi.create.content.fluids.pipes.FluidPipeBlockEntity; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import com.simibubi.create.foundation.blockEntity.IMultiBlockEntityContainer; import com.simibubi.create.foundation.fluid.CombinedTankWrapper; import com.simibubi.create.foundation.recipe.RecipeFinder; - - import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; import net.createmod.catnip.lang.LangBuilder; @@ -36,16 +28,12 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidTank; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.templates.FluidTank; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; -import java.util.Optional; - -import static java.lang.Math.abs; public class BlastStoveBlockEntity extends FluidTankBlockEntity implements IHaveGoggleInformation, IMultiBlockEntityContainer.Fluid { diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinBlock.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinBlock.java index 7a5cc613..5c4f2cf3 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinBlock.java @@ -1,7 +1,7 @@ package com.drmangotea.tfmg.content.machinery.metallurgy.casting_basin; -import com.drmangotea.tfmg.base.blocks.TFMGHorizontalDirectionalBlock; import com.drmangotea.tfmg.base.TFMGShapes; +import com.drmangotea.tfmg.base.blocks.TFMGHorizontalDirectionalBlock; import com.drmangotea.tfmg.registry.TFMGBlockEntities; import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinBlockEntity.java index 53f12455..fc062787 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinBlockEntity.java @@ -28,7 +28,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.List; -import java.util.function.Supplier; import static net.minecraft.world.level.block.HorizontalDirectionalBlock.FACING; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenBlockEntity.java index c38a243c..6b6cafbc 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenBlockEntity.java @@ -23,8 +23,6 @@ import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.item.ItemEntity; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; @@ -34,7 +32,6 @@ import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fluids.capability.templates.FluidTank; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.RecipeWrapper; import net.minecraftforge.network.PacketDistributor; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenPacket.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenPacket.java index aaecfdce..d371f6b1 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenPacket.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/coke_oven/CokeOvenPacket.java @@ -1,7 +1,6 @@ package com.drmangotea.tfmg.content.machinery.metallurgy.coke_oven; -import com.drmangotea.tfmg.content.electricity.base.IElectric; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.networking.BlockEntityDataPacket; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteFillingBehavior.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteFillingBehavior.java index 6d782443..856606a6 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteFillingBehavior.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteFillingBehavior.java @@ -1,41 +1,36 @@ package com.drmangotea.tfmg.content.machinery.misc.concrete_hose; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.registry.TFMGFluids; -import com.simibubi.create.content.fluids.transfer.FluidManipulationBehaviour; import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BehaviourType; import com.simibubi.create.foundation.fluid.FluidHelper; -import net.createmod.catnip.data.Iterate; import com.simibubi.create.infrastructure.config.AllConfigs; import it.unimi.dsi.fastutil.PriorityQueue; import it.unimi.dsi.fastutil.objects.ObjectHeapPriorityQueue; +import net.createmod.catnip.data.Iterate; import net.createmod.catnip.math.BBHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; -import net.minecraft.tags.BlockTags; import net.minecraft.tags.FluidTags; -import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.DoorBlock; -import net.minecraft.world.level.block.LiquidBlock; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.levelgen.structure.BoundingBox; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; -import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.ticks.LevelTickAccess; import net.minecraft.world.ticks.LevelTicks; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; import static com.drmangotea.tfmg.content.decoration.concrete.ConcreteloggedBlock.CONCRETELOGGED; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlock.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlock.java index 1ccd309a..1d324475 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlock.java @@ -1,8 +1,6 @@ package com.drmangotea.tfmg.content.machinery.misc.concrete_hose; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.simibubi.create.AllBlockEntityTypes; -import com.simibubi.create.content.fluids.hosePulley.HosePulleyBlockEntity; import com.simibubi.create.content.fluids.pipes.FluidPipeBlock; import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock; import com.simibubi.create.foundation.block.IBE; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlockEntity.java index e36ed9be..95268c8f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseBlockEntity.java @@ -1,11 +1,7 @@ package com.drmangotea.tfmg.content.machinery.misc.concrete_hose; import com.simibubi.create.content.fluids.hosePulley.HosePulleyBlock; -import com.simibubi.create.content.fluids.hosePulley.HosePulleyFluidHandler; -import com.simibubi.create.content.fluids.transfer.FluidDrainingBehaviour; -import com.simibubi.create.content.fluids.transfer.FluidFillingBehaviour; import com.simibubi.create.content.kinetics.base.KineticBlockEntity; -import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.fluid.SmartFluidTank; import com.simibubi.create.foundation.item.TooltipHelper; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseFluidHandler.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseFluidHandler.java index 7f4e6d23..cddef3ac 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseFluidHandler.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseFluidHandler.java @@ -1,15 +1,12 @@ package com.drmangotea.tfmg.content.machinery.misc.concrete_hose; import com.drmangotea.tfmg.registry.TFMGFluids; -import com.simibubi.create.content.fluids.transfer.FluidDrainingBehaviour; -import com.simibubi.create.content.fluids.transfer.FluidFillingBehaviour; import com.simibubi.create.foundation.fluid.FluidHelper; import com.simibubi.create.foundation.fluid.SmartFluidTank; import net.minecraft.core.BlockPos; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.IFluidHandler; -import javax.annotation.Nullable; import java.util.function.Supplier; public class ConcreteHoseFluidHandler implements IFluidHandler { diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseRenderer.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseRenderer.java index d2cea4f1..65468c41 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseRenderer.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.content.machinery.misc.concrete_hose; import com.simibubi.create.AllPartialModels; import com.simibubi.create.AllSpriteShifts; import com.simibubi.create.content.contraptions.pulley.AbstractPulleyRenderer; - import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SpriteShiftEntry; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseVisual.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseVisual.java index 31e57ba5..e711a3ce 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseVisual.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/ConcreteHoseVisual.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.content.machinery.misc.concrete_hose; import com.simibubi.create.AllPartialModels; import com.simibubi.create.AllSpriteShifts; import com.simibubi.create.content.contraptions.pulley.AbstractPulleyVisual; -import com.simibubi.create.content.fluids.hosePulley.HosePulleyBlockEntity; import com.simibubi.create.content.processing.burner.ScrollInstance; import com.simibubi.create.foundation.render.AllInstanceTypes; import dev.engine_room.flywheel.api.instance.Instancer; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/TFMGFluidManipulationBehaviour.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/TFMGFluidManipulationBehaviour.java index da273277..82ef534a 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/TFMGFluidManipulationBehaviour.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/concrete_hose/TFMGFluidManipulationBehaviour.java @@ -6,10 +6,9 @@ import com.simibubi.create.content.fluids.transfer.FluidSplashPacket; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.fluid.FluidHelper; -import net.createmod.catnip.data.Iterate; - -import net.createmod.catnip.math.VecHelper; import com.simibubi.create.infrastructure.config.AllConfigs; +import net.createmod.catnip.data.Iterate; +import net.createmod.catnip.math.VecHelper; import net.createmod.catnip.nbt.NBTHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/firebox/FireboxBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/firebox/FireboxBlockEntity.java index d903aa11..00881930 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/firebox/FireboxBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/firebox/FireboxBlockEntity.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.content.machinery.misc.firebox; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.config.TFMGConfigs; import com.drmangotea.tfmg.registry.TFMGFluids; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/flarestack/FlarestackBlock.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/flarestack/FlarestackBlock.java index f9de586a..82ce450c 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/flarestack/FlarestackBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/flarestack/FlarestackBlock.java @@ -3,14 +3,11 @@ package com.drmangotea.tfmg.content.machinery.misc.flarestack; import com.drmangotea.tfmg.base.TFMGShapes; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.simibubi.create.Create; import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; -import net.minecraft.core.particles.ParticleTypes; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/gas_lamp/GasLampBlock.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/gas_lamp/GasLampBlock.java index d60bf0f9..7bea1e01 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/gas_lamp/GasLampBlock.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/gas_lamp/GasLampBlock.java @@ -1,9 +1,7 @@ package com.drmangotea.tfmg.content.machinery.misc.gas_lamp; import com.drmangotea.tfmg.base.TFMGShapes; -import com.drmangotea.tfmg.content.machinery.misc.flarestack.FlarestackBlockEntity; import com.drmangotea.tfmg.registry.TFMGBlockEntities; -import com.simibubi.create.content.equipment.wrench.IWrenchable; import com.simibubi.create.foundation.block.IBE; import net.minecraft.core.BlockPos; import net.minecraft.world.item.context.BlockPlaceContext; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/machine_input/MachineInputBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/machine_input/MachineInputBlockEntity.java index ecb6589e..70b26788 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/machine_input/MachineInputBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/machine_input/MachineInputBlockEntity.java @@ -2,16 +2,10 @@ package com.drmangotea.tfmg.content.machinery.misc.machine_input; import com.simibubi.create.content.kinetics.base.KineticBlockEntity; - -import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.chat.Component; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; -import java.util.List; - public class MachineInputBlockEntity extends KineticBlockEntity { public MachineInputBlockEntity(BlockEntityType typeIn, BlockPos pos, BlockState state) { super(typeIn, pos, state); diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/SpoolItem.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/SpoolItem.java index 6275b6ad..845709e6 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/SpoolItem.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/SpoolItem.java @@ -4,7 +4,6 @@ import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGRegistries; import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.content.electricity.base.ElectricPlacementPacket; -import com.drmangotea.tfmg.content.electricity.base.UpdateInFrontPacket; import com.drmangotea.tfmg.content.electricity.connection.cable_type.CableType; import com.drmangotea.tfmg.content.electricity.connection.cables.CableConnection; import com.drmangotea.tfmg.content.electricity.connection.cables.CableConnectorBlockEntity; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineBlockEntity.java index 8d1e7160..e776dc7f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineBlockEntity.java @@ -1,8 +1,5 @@ package com.drmangotea.tfmg.content.machinery.misc.winding_machine; -import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.content.engines.base.AbstractEngineBlockEntity; -import com.drmangotea.tfmg.recipes.PolarizingRecipe; import com.drmangotea.tfmg.recipes.WindingRecipe; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGItems; @@ -15,10 +12,9 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollValueBehaviour; import com.simibubi.create.foundation.item.ItemHelper; import com.simibubi.create.foundation.item.SmartInventory; - import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.math.VecHelper; import net.createmod.catnip.animation.LerpedFloat; +import net.createmod.catnip.math.VecHelper; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -33,7 +29,6 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ForgeCapabilities; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.wrapper.RecipeWrapper; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineRenderer.java b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineRenderer.java index ad8987c9..a0b7321d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/misc/winding_machine/WindingMachineRenderer.java @@ -1,8 +1,6 @@ package com.drmangotea.tfmg.content.machinery.misc.winding_machine; import com.drmangotea.tfmg.registry.TFMGPartialModels; -import com.drmangotea.tfmg.registry.TFMGTags; - import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.simibubi.create.AllPartialModels; @@ -20,6 +18,7 @@ import net.minecraft.core.Direction; import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.state.BlockState; +import net.minecraftforge.common.Tags; import static com.simibubi.create.content.kinetics.base.HorizontalKineticBlock.HORIZONTAL_FACING; import static net.minecraft.world.level.block.HorizontalDirectionalBlock.FACING; @@ -88,7 +87,7 @@ public class WindingMachineRenderer extends KineticBlockEntityRenderer extends AbstractBuilder factory; - private NonNullSupplier initialProperties = () -> new Electrode.Properties(new ResourceLocation(getOwner().getModid(), getName())); + private NonNullSupplier initialProperties = () -> new Electrode.Properties(ResourceLocation.fromNamespaceAndPath(getOwner().getModid(), getName())); private NonNullFunction propertiesCallback = NonNullUnaryOperator.identity(); public ElectrodeBuilder(AbstractRegistrate owner, P parent, String name, BuilderCallback callback, NonNullFunction factory) { @@ -60,7 +60,7 @@ public class ElectrodeBuilder extends AbstractBuilder register() { - TFMGRegistries.registeredElectrodes.put(new ResourceLocation(getOwner().getModid(), getName()), createEntry()); + TFMGRegistries.registeredElectrodes.put(ResourceLocation.fromNamespaceAndPath(getOwner().getModid(), getName()), createEntry()); return (ElectrodeEntry) super.register(); } } diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/electrode/ElectrodeEntry.java b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/electrode/ElectrodeEntry.java index ec35a876..4a166b2d 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/electrode/ElectrodeEntry.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/electrode_holder/electrode/ElectrodeEntry.java @@ -1,7 +1,5 @@ package com.drmangotea.tfmg.content.machinery.vat.electrode_holder.electrode; -import com.drmangotea.tfmg.content.electricity.connection.cable_type.CableType; -import com.drmangotea.tfmg.content.electricity.connection.cable_type.CableTypeEntry; import com.tterrag.registrate.AbstractRegistrate; import com.tterrag.registrate.util.entry.RegistryEntry; import net.minecraftforge.registries.RegistryObject; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerBlockEntity.java index ce736a5a..afbfbe42 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerBlockEntity.java @@ -1,23 +1,11 @@ package com.drmangotea.tfmg.content.machinery.vat.industrial_mixer; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.machinery.vat.base.IVatMachine; import com.drmangotea.tfmg.content.machinery.vat.base.VatBlock; import com.drmangotea.tfmg.content.machinery.vat.base.VatBlockEntity; import com.drmangotea.tfmg.registry.TFMGItems; -import com.drmangotea.tfmg.registry.TFMGPartialModels; -import com.simibubi.create.AllPartialModels; -import com.simibubi.create.Create; import com.simibubi.create.content.kinetics.base.IRotate; import com.simibubi.create.content.kinetics.base.KineticBlockEntity; -import com.simibubi.create.content.kinetics.base.OrientedRotatingVisual; -import com.simibubi.create.content.kinetics.gantry.GantryShaftBlock; -import com.simibubi.create.content.kinetics.gantry.GantryShaftBlockEntity; -import com.simibubi.create.content.kinetics.mixer.MechanicalMixerBlock; -import com.simibubi.create.infrastructure.config.AllConfigs; -import dev.engine_room.flywheel.api.visual.BlockEntityVisual; -import dev.engine_room.flywheel.api.visualization.VisualizationContext; -import dev.engine_room.flywheel.lib.model.Models; import net.createmod.catnip.animation.LerpedFloat; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerRenderer.java b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerRenderer.java index 75e73440..41164a48 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerRenderer.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerRenderer.java @@ -1,10 +1,10 @@ package com.drmangotea.tfmg.content.machinery.vat.industrial_mixer; import com.drmangotea.tfmg.registry.TFMGPartialModels; -import dev.engine_room.flywheel.lib.model.baked.PartialModel; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; +import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerVisual.java b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerVisual.java index 62fe5a17..d7429090 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerVisual.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/vat/industrial_mixer/IndustrialMixerVisual.java @@ -3,19 +3,15 @@ package com.drmangotea.tfmg.content.machinery.vat.industrial_mixer; import com.simibubi.create.AllPartialModels; import com.simibubi.create.content.kinetics.base.KineticBlockEntityVisual; import com.simibubi.create.content.kinetics.base.RotatingInstance; -import com.simibubi.create.content.kinetics.fan.EncasedFanBlockEntity; import com.simibubi.create.foundation.render.AllInstanceTypes; import dev.engine_room.flywheel.api.instance.Instance; import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.lib.model.Models; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.util.Mth; import java.util.function.Consumer; -import static net.minecraft.world.level.block.state.properties.BlockStateProperties.FACING; - public class IndustrialMixerVisual extends KineticBlockEntityVisual { protected final RotatingInstance shaft; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/TFMGDatagen.java b/src/main/java/com/drmangotea/tfmg/datagen/TFMGDatagen.java index ef3a28b9..6d2bbf23 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/TFMGDatagen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/TFMGDatagen.java @@ -4,7 +4,7 @@ import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.TFMGRegistrateTags; import com.drmangotea.tfmg.datagen.recipes.TFMGProcessingRecipeGen; import com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider; -import com.drmangotea.tfmg.datagen.recipes.values.*; +import com.drmangotea.tfmg.datagen.recipes.values.TFMGStandardRecipeGen; import com.drmangotea.tfmg.datagen.recipes.values.create.TFMGMechanicalCraftingRecipeGen; import com.drmangotea.tfmg.datagen.recipes.values.create.TFMGSequencedAssemblyRecipeGen; import com.drmangotea.tfmg.datagen.recipes.values.tfmg.CastingRecipeGen; @@ -13,7 +13,6 @@ import com.drmangotea.tfmg.datagen.recipes.values.tfmg.VatRecipeGen; import com.drmangotea.tfmg.ponder.TFMGPonderPlugin; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.simibubi.create.Create; import com.simibubi.create.foundation.utility.FilesHelper; import com.tterrag.registrate.providers.ProviderType; import net.createmod.ponder.foundation.PonderIndex; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGProcessingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGProcessingRecipeGen.java index 6af99743..0351a5e5 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGProcessingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGProcessingRecipeGen.java @@ -1,8 +1,18 @@ package com.drmangotea.tfmg.datagen.recipes; import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.datagen.recipes.values.create.*; -import com.drmangotea.tfmg.datagen.recipes.values.tfmg.*; +import com.drmangotea.tfmg.datagen.recipes.values.create.TFMGCompactingRecipeGen; +import com.drmangotea.tfmg.datagen.recipes.values.create.TFMGCrushingRecipeGen; +import com.drmangotea.tfmg.datagen.recipes.values.create.TFMGDeployingRecipeGen; +import com.drmangotea.tfmg.datagen.recipes.values.create.TFMGFillingRecipeGen; +import com.drmangotea.tfmg.datagen.recipes.values.create.TFMGItemApplicationRecipeGen; +import com.drmangotea.tfmg.datagen.recipes.values.create.TFMGMixingRecipeGen; +import com.drmangotea.tfmg.datagen.recipes.values.create.TFMGPressingRecipeGen; +import com.drmangotea.tfmg.datagen.recipes.values.tfmg.CokingRecipeGen; +import com.drmangotea.tfmg.datagen.recipes.values.tfmg.DistillationRecipeGen; +import com.drmangotea.tfmg.datagen.recipes.values.tfmg.HotBlastRecipeGen; +import com.drmangotea.tfmg.datagen.recipes.values.tfmg.PolarizingRecipeGen; +import com.drmangotea.tfmg.datagen.recipes.values.tfmg.WindingRecipeGen; import com.simibubi.create.content.processing.recipe.ProcessingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.content.processing.recipe.ProcessingRecipeSerializer; @@ -72,7 +82,7 @@ public abstract class TFMGProcessingRecipeGen extends TFMGRecipeProvider { ItemLike itemLike = singleIngredient.get(); transform .apply(new ProcessingRecipeBuilder<>(serializer.getFactory(), - new ResourceLocation(namespace, CatnipServices.REGISTRIES.getKeyOrThrow(itemLike.asItem()) + ResourceLocation.fromNamespaceAndPath(namespace, CatnipServices.REGISTRIES.getKeyOrThrow(itemLike.asItem()) .getPath())).withItemIngredients(Ingredient.of(itemLike))) .build(c); }; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGRecipeProvider.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGRecipeProvider.java index 44e59fab..72c11591 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGRecipeProvider.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/TFMGRecipeProvider.java @@ -7,15 +7,19 @@ import com.drmangotea.tfmg.datagen.recipes.builder.IndustrialBlastingRecipeBuild import com.drmangotea.tfmg.datagen.recipes.builder.VatMachineRecipeBuilder; import com.drmangotea.tfmg.recipes.IndustrialBlastingRecipe; import com.drmangotea.tfmg.recipes.VatMachineRecipe; -import com.drmangotea.tfmg.registry.*; +import com.drmangotea.tfmg.registry.TFMGBlocks; +import com.drmangotea.tfmg.registry.TFMGFluids; +import com.drmangotea.tfmg.registry.TFMGItems; +import com.drmangotea.tfmg.registry.TFMGRecipeTypes; +import com.drmangotea.tfmg.registry.TFMGTags; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllFluids; import com.simibubi.create.AllItems; -import com.simibubi.create.AllTags; import com.simibubi.create.content.decoration.palettes.AllPaletteBlocks; import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes; import com.simibubi.create.content.processing.recipe.ProcessingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeSerializer; +import com.simibubi.create.foundation.data.recipe.CommonMetal; import net.createmod.catnip.platform.CatnipServices; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.FinishedRecipe; @@ -378,10 +382,10 @@ public class TFMGRecipeProvider extends RecipeProvider { return ItemTags.LOGS_THAT_BURN; } public static TagKey gold() { - return AllTags.forgeItemTag("ingots/gold"); + return CommonMetal.GOLD.ingots; } public static TagKey string() { - return AllTags.forgeItemTag("string"); + return Tags.Items.STRING; } public static ItemLike propeller() { @@ -459,7 +463,7 @@ public class TFMGRecipeProvider extends RecipeProvider { public static TagKey goldSheet() { - return AllTags.forgeItemTag("plates/gold"); + return CommonMetal.GOLD.plates; } public static TagKey stone() { @@ -496,11 +500,11 @@ public class TFMGRecipeProvider extends RecipeProvider { } public static TagKey brassIngot() { - return AllTags.forgeItemTag("ingots/brass"); + return CommonMetal.BRASS.ingots; } public static TagKey brassSheet() { - return AllTags.forgeItemTag("plates/brass"); + return CommonMetal.BRASS.plates; } public static TagKey iron() { @@ -508,23 +512,19 @@ public class TFMGRecipeProvider extends RecipeProvider { } public static TagKey ironNugget() { - return AllTags.forgeItemTag("nuggets/iron"); + return CommonMetal.IRON.nuggets; } public static TagKey ironDust() { - return AllTags.forgeItemTag("dusts/iron"); + return TFMGTags.TFMGItemTags.DUSTS_IRON.tag; } public static TagKey zincIngot() { - return AllTags.forgeItemTag("ingots/zinc"); + return CommonMetal.ZINC.ingots; } public static TagKey ironSheet() { - return AllTags.forgeItemTag("plates/iron"); - } - - public static TagKey sturdySheet() { - return AllTags.forgeItemTag("plates/obsidian"); + return CommonMetal.IRON.plates; } public static ItemLike brassCasing() { @@ -548,15 +548,11 @@ public class TFMGRecipeProvider extends RecipeProvider { } public static TagKey brassBlock() { - return AllTags.forgeItemTag("storage_blocks/brass"); + return CommonMetal.BRASS.storageBlocks.items(); } public static TagKey zincBlock() { - return AllTags.forgeItemTag("storage_blocks/zinc"); - } - - public static TagKey wheatFlour() { - return AllTags.forgeItemTag("flour/wheat"); + return CommonMetal.ZINC.storageBlocks.items(); } public static ItemLike copperIngot() { @@ -564,19 +560,19 @@ public class TFMGRecipeProvider extends RecipeProvider { } public static TagKey copperSheet() { - return AllTags.forgeItemTag("plates/copper"); + return CommonMetal.COPPER.plates; } public static TagKey copperNugget() { - return AllTags.forgeItemTag("nuggets/copper"); + return CommonMetal.COPPER.nuggets; } public static TagKey brassNugget() { - return AllTags.forgeItemTag("nuggets/brass"); + return CommonMetal.BRASS.nuggets; } public static TagKey zincNugget() { - return AllTags.forgeItemTag("nuggets/zinc"); + return CommonMetal.ZINC.nuggets; } public static ItemLike copperCasing() { @@ -591,10 +587,6 @@ public class TFMGRecipeProvider extends RecipeProvider { return AllItems.SHADOW_STEEL.get(); } - public static Ingredient netherite() { - return Ingredient.of(AllTags.forgeItemTag("ingots/netherite")); - } - public static ItemStack resistor10Ohms(){ ItemStack stack = TFMGBlocks.RESISTOR.asStack(); @@ -814,7 +806,7 @@ public class TFMGRecipeProvider extends RecipeProvider { ItemLike itemLike = singleIngredient.get(); transform .apply((IndustrialBlastingRecipeBuilder) new IndustrialBlastingRecipeBuilder(serializer.getFactory(),hotAirUsage, - new ResourceLocation(namespace, CatnipServices.REGISTRIES.getKeyOrThrow(itemLike.asItem()) + ResourceLocation.fromNamespaceAndPath(namespace, CatnipServices.REGISTRIES.getKeyOrThrow(itemLike.asItem()) .getPath())).withItemIngredients(Ingredient.of(itemLike))) .build(c); }; @@ -859,7 +851,7 @@ public class TFMGRecipeProvider extends RecipeProvider { ItemLike itemLike = singleIngredient.get(); transform .apply((VatMachineRecipeBuilder) new VatMachineRecipeBuilder(serializer.getFactory(),params, - new ResourceLocation(namespace, CatnipServices.REGISTRIES.getKeyOrThrow(itemLike.asItem()) + ResourceLocation.fromNamespaceAndPath(namespace, CatnipServices.REGISTRIES.getKeyOrThrow(itemLike.asItem()) .getPath())).withItemIngredients(Ingredient.of(itemLike))) .build(c); }; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/IndustrialBlastingRecipeBuilder.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/IndustrialBlastingRecipeBuilder.java index 06a0f087..61358dd5 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/IndustrialBlastingRecipeBuilder.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/IndustrialBlastingRecipeBuilder.java @@ -1,8 +1,6 @@ package com.drmangotea.tfmg.datagen.recipes.builder; import com.drmangotea.tfmg.recipes.IndustrialBlastingRecipe; -import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.simibubi.create.content.processing.recipe.ProcessingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/VatMachineRecipeBuilder.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/VatMachineRecipeBuilder.java index a6df7772..fbb4cf84 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/VatMachineRecipeBuilder.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/builder/VatMachineRecipeBuilder.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.datagen.recipes.builder; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.recipes.VatMachineRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import net.minecraft.data.recipes.FinishedRecipe; diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/TFMGStandardRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/TFMGStandardRecipeGen.java index 1bd7312a..e29c9822 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/TFMGStandardRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/TFMGStandardRecipeGen.java @@ -6,14 +6,12 @@ import com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGFluids; import com.drmangotea.tfmg.registry.TFMGItems; -import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableList; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; -import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.content.decoration.palettes.AllPaletteBlocks; import com.simibubi.create.foundation.data.recipe.CommonMetal; import com.simibubi.create.foundation.data.recipe.Mods; @@ -23,7 +21,13 @@ import com.tterrag.registrate.util.entry.ItemProviderEntry; import net.createmod.catnip.platform.CatnipServices; import net.minecraft.advancements.critereon.ItemPredicate; import net.minecraft.data.PackOutput; -import net.minecraft.data.recipes.*; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.data.recipes.ShapedRecipeBuilder; +import net.minecraft.data.recipes.ShapelessRecipeBuilder; +import net.minecraft.data.recipes.SimpleCookingRecipeBuilder; +import net.minecraft.data.recipes.SmithingTransformRecipeBuilder; +import net.minecraft.data.recipes.SpecialRecipeBuilder; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; @@ -48,8 +52,91 @@ import java.util.List; import java.util.Map; import java.util.function.UnaryOperator; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.*; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.aluminumCasing; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.aluminumFrame; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.aluminumIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.aluminumNugget; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.aluminumPipe; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.aluminumSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.aluminumTruss; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.aluminumWire; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.brassFrame; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.brassIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.brassNugget; import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.brassPipe; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.brassSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.brassTruss; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.capacitor; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.castIronBlock; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.castIronFrame; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.castIronIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.castIronNugget; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.castIronPipe; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.castIronSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.castIronTank; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.castIronTruss; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.circuitBoard; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.coalCoke; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.cog; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.constantanFrame; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.constantanNugget; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.constantanTruss; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.constantanWire; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.copperFrame; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.copperIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.copperNugget; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.copperSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.copperTruss; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.copperWire; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.electronTube; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.fireproofBricks; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.framedGlass; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.greenDye; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.heavyMachineryCasing; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.heavyPlate; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.industrialPipe; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.ironSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.leadBlock; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.leadFrame; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.leadIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.leadNugget; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.leadSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.leadTruss; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.lightBulb; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.lithiumBlock; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.lithiumIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.magnet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.magneticIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.nickelFrame; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.nickelIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.nickelNugget; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.nickelSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.nickelTruss; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.plasticPipe; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.plasticSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.propeller; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.rebar; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.redstone; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.rubber; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.screw; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.shaft; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelBlock; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelCasing; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelFrame; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelMechanism; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelNugget; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelPipe; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelTank; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelTruss; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.string; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.tfmgSteelIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.thermitePowder; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.zincFrame; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.zincIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.zincNugget; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.zincTruss; public class TFMGStandardRecipeGen extends TFMGRecipeProvider { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCompactingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCompactingRecipeGen.java index d43bf0f5..e5dc74fd 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCompactingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCompactingRecipeGen.java @@ -5,8 +5,12 @@ import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.content.processing.recipe.HeatCondition; import net.minecraft.data.PackOutput; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.*; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.*; + +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.heavyOil; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.bitumen; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.cinderFlour; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.coal; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.ironIngot; public class TFMGCompactingRecipeGen extends TFMGProcessingRecipeGen { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCrushingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCrushingRecipeGen.java index f9993780..f77d302e 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCrushingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGCrushingRecipeGen.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.datagen.recipes.values.create; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.datagen.recipes.TFMGProcessingRecipeGen; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGItems; @@ -9,8 +8,16 @@ import com.simibubi.create.AllRecipeTypes; import net.minecraft.data.PackOutput; import net.minecraft.world.item.Items; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.*; -import static com.drmangotea.tfmg.registry.TFMGTags.forgeItemTag; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.blueDye; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.boneMeal; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.coal; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.coalCokeDust; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.crushedRawLead; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.cyanDye; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.limesand; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.nitrateDust; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.slag; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.sulfurDust; public class TFMGCrushingRecipeGen extends TFMGProcessingRecipeGen { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGFillingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGFillingRecipeGen.java index 2a3459d0..572711d7 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGFillingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGFillingRecipeGen.java @@ -11,7 +11,24 @@ import net.minecraft.tags.ItemTags; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.*; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.air; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.airTank; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.blastFurnaceGas; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.carbonDioxide; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.carbonDioxideTank; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.ethylene; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.ethyleneTank; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.furnaceGasTank; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.hotAir; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.hotAirTank; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.hydrogen; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.hydrogenTank; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.lpg; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.lpgTank; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.neon; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.neonTank; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.propylene; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.propyleneTank; public class TFMGFillingRecipeGen extends TFMGProcessingRecipeGen { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGItemApplicationRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGItemApplicationRecipeGen.java index be22440b..602914d3 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGItemApplicationRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGItemApplicationRecipeGen.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.datagen.recipes.values.create; import com.drmangotea.tfmg.datagen.recipes.TFMGProcessingRecipeGen; import com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider; import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.AllRecipeTypes; import net.minecraft.data.PackOutput; import net.minecraft.world.item.crafting.Ingredient; @@ -11,7 +10,9 @@ import net.minecraft.world.level.ItemLike; import java.util.function.Supplier; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.*; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.aluminumSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelSheet; public class TFMGItemApplicationRecipeGen extends TFMGProcessingRecipeGen { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMechanicalCraftingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMechanicalCraftingRecipeGen.java index c9dc0255..27548ff9 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMechanicalCraftingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMechanicalCraftingRecipeGen.java @@ -1,14 +1,10 @@ package com.drmangotea.tfmg.datagen.recipes.values.create; -import java.util.function.UnaryOperator; - import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGItems; import com.google.common.base.Supplier; -import com.simibubi.create.Create; - import com.simibubi.create.api.data.recipe.MechanicalCraftingRecipeBuilder; import net.createmod.catnip.platform.CatnipServices; import net.minecraft.data.PackOutput; @@ -16,7 +12,25 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Items; import net.minecraft.world.level.ItemLike; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.*; +import java.util.function.UnaryOperator; + +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.aluminumIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.aluminumSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.castIronIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.circuitBoard; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.copperWire; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.heavyMachineryCasing; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.magnet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.precisionMechanism; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.rebar; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.rubber; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.shaft; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelBlock; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelMechanism; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelPipe; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelTank; public class TFMGMechanicalCraftingRecipeGen extends TFMGRecipeProvider { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMixingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMixingRecipeGen.java index f5c0302e..5a92c28e 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMixingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGMixingRecipeGen.java @@ -6,8 +6,34 @@ import com.simibubi.create.AllRecipeTypes; import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes; import com.simibubi.create.content.processing.recipe.HeatCondition; import net.minecraft.data.PackOutput; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.*; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.*; + +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.coolingFluid; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.ethylene; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.gasoline; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.liquidAsphalt; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.liquidConcrete; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.napalm; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.sulfuricAcid; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.water; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.aluminumIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.asphaltMixture; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.bitumen; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.cement; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.charcoal; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.clayBall; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.concreteMixture; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.copperIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.copperSulfate; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.gravel; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.gunpowder; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.limesand; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.magneticIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.nickelIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.nitrateDust; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.sand; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.slag; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.sulfurDust; public class TFMGMixingRecipeGen extends TFMGProcessingRecipeGen { GeneratedRecipe diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGPressingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGPressingRecipeGen.java index 675cdae7..a3fd24f8 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGPressingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGPressingRecipeGen.java @@ -4,7 +4,16 @@ import com.drmangotea.tfmg.datagen.recipes.TFMGProcessingRecipeGen; import com.simibubi.create.AllRecipeTypes; import net.minecraft.data.PackOutput; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.*; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.aluminumIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.aluminumSheetTFMG; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.castIronIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.castIronSheetTFMG; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.leadIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.leadSheetTFMG; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.nickelIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.nickelSheetTFMG; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.rubber; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.syntheticLeather; public class TFMGPressingRecipeGen extends TFMGProcessingRecipeGen { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGSequencedAssemblyRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGSequencedAssemblyRecipeGen.java index 50c14462..6f10d1c7 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGSequencedAssemblyRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/create/TFMGSequencedAssemblyRecipeGen.java @@ -6,22 +6,27 @@ import com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider; import com.drmangotea.tfmg.recipes.WindingRecipe; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGItems; -import com.drmangotea.tfmg.registry.TFMGTags; -import com.simibubi.create.AllTags; -import com.simibubi.create.api.data.recipe.BaseRecipeProvider; import com.simibubi.create.content.fluids.transfer.FillingRecipe; import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe; import com.simibubi.create.content.kinetics.press.PressingRecipe; import com.simibubi.create.content.processing.sequenced.SequencedAssemblyRecipeBuilder; -import com.simibubi.create.foundation.data.recipe.CreateRecipeProvider; import net.minecraft.data.PackOutput; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import java.util.function.UnaryOperator; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.*; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.*; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.lubricationOil; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.copperSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.copperWire; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.leadSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.magnet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.nickelSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.plasticSheet; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.shaft; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelIngot; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelMechanism; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.steelSheet; public class TFMGSequencedAssemblyRecipeGen extends TFMGRecipeProvider { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/CastingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/CastingRecipeGen.java index 7f6fbfbb..8d81d6e2 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/CastingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/CastingRecipeGen.java @@ -1,7 +1,11 @@ package com.drmangotea.tfmg.datagen.recipes.values.tfmg; import com.drmangotea.tfmg.datagen.recipes.TFMGProcessingRecipeGen; -import com.drmangotea.tfmg.registry.*; +import com.drmangotea.tfmg.registry.TFMGBlocks; +import com.drmangotea.tfmg.registry.TFMGFluids; +import com.drmangotea.tfmg.registry.TFMGItems; +import com.drmangotea.tfmg.registry.TFMGRecipeTypes; +import com.drmangotea.tfmg.registry.TFMGTags; import net.minecraft.data.PackOutput; public class CastingRecipeGen extends TFMGProcessingRecipeGen { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/DistillationRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/DistillationRecipeGen.java index b7368164..32d0589f 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/DistillationRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/DistillationRecipeGen.java @@ -5,7 +5,13 @@ import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import com.drmangotea.tfmg.registry.TFMGTags; import net.minecraft.data.PackOutput; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.*; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.diesel; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.gasoline; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.heavyOil; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.kerosene; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.lpg; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.lubricationOil; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.naphtha; public class DistillationRecipeGen extends TFMGProcessingRecipeGen { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/HotBlastRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/HotBlastRecipeGen.java index 5d5a34bc..bff7c0c3 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/HotBlastRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/HotBlastRecipeGen.java @@ -5,7 +5,9 @@ import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import com.drmangotea.tfmg.registry.TFMGTags; import net.minecraft.data.PackOutput; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.*; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.air; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.carbonDioxide; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.hotAir; public class HotBlastRecipeGen extends TFMGProcessingRecipeGen { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/VatRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/VatRecipeGen.java index 5286ac41..a1697449 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/VatRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/VatRecipeGen.java @@ -7,14 +7,22 @@ import com.drmangotea.tfmg.registry.TFMGItems; import com.drmangotea.tfmg.registry.TFMGTags; import com.simibubi.create.content.processing.recipe.HeatCondition; import net.minecraft.data.PackOutput; -import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.material.Fluids; import java.util.ArrayList; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.*; -import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.*; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.ethylene; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.heavyOil; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.liquidPlastic; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.naphtha; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.propylene; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.sulfuricAcid; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.F.water; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.crushedRawIron; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.nitrateDust; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.rubber; +import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.sulfurDust; import static com.drmangotea.tfmg.datagen.recipes.builder.VatMachineRecipeBuilder.VatRecipeParams; public class VatRecipeGen extends TFMGRecipeProvider { diff --git a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/WindingRecipeGen.java b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/WindingRecipeGen.java index 08c07de4..fc9789a1 100644 --- a/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/WindingRecipeGen.java +++ b/src/main/java/com/drmangotea/tfmg/datagen/recipes/values/tfmg/WindingRecipeGen.java @@ -1,11 +1,9 @@ package com.drmangotea.tfmg.datagen.recipes.values.tfmg; import com.drmangotea.tfmg.datagen.recipes.TFMGProcessingRecipeGen; -import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGItems; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import net.minecraft.data.PackOutput; -import net.minecraft.world.level.block.Blocks; import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.coil100Turns; import static com.drmangotea.tfmg.datagen.recipes.TFMGRecipeProvider.I.resistor10Ohms; diff --git a/src/main/java/com/drmangotea/tfmg/mixin/FluidPipeBlockMixin.java b/src/main/java/com/drmangotea/tfmg/mixin/FluidPipeBlockMixin.java index 46ddf72b..7d56f53e 100644 --- a/src/main/java/com/drmangotea/tfmg/mixin/FluidPipeBlockMixin.java +++ b/src/main/java/com/drmangotea/tfmg/mixin/FluidPipeBlockMixin.java @@ -11,7 +11,12 @@ import com.simibubi.create.content.decoration.encasing.EncasableBlock; import com.simibubi.create.content.equipment.wrench.IWrenchableWithBracket; import com.simibubi.create.content.fluids.FluidPropagator; import com.simibubi.create.content.fluids.FluidTransportBehaviour; -import com.simibubi.create.content.fluids.pipes.*; +import com.simibubi.create.content.fluids.pipes.EncasedPipeBlock; +import com.simibubi.create.content.fluids.pipes.FluidPipeBlock; +import com.simibubi.create.content.fluids.pipes.FluidPipeBlockEntity; +import com.simibubi.create.content.fluids.pipes.FluidPipeBlockRotation; +import com.simibubi.create.content.fluids.pipes.GlassFluidPipeBlock; +import com.simibubi.create.content.fluids.pipes.VanillaFluidTargets; import com.simibubi.create.foundation.advancement.AdvancementBehaviour; import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.block.IBE; @@ -34,7 +39,11 @@ import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Mirror; +import net.minecraft.world.level.block.PipeBlock; +import net.minecraft.world.level.block.Rotation; +import net.minecraft.world.level.block.SimpleWaterloggedBlock; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition.Builder; diff --git a/src/main/java/com/drmangotea/tfmg/mixin/FluidPropagatorMixin.java b/src/main/java/com/drmangotea/tfmg/mixin/FluidPropagatorMixin.java index 9da210b4..0a4157c6 100644 --- a/src/main/java/com/drmangotea/tfmg/mixin/FluidPropagatorMixin.java +++ b/src/main/java/com/drmangotea/tfmg/mixin/FluidPropagatorMixin.java @@ -15,9 +15,8 @@ import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.advancement.CreateAdvancement; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.utility.BlockHelper; -import net.createmod.catnip.data.Iterate; - import com.simibubi.create.infrastructure.config.AllConfigs; +import net.createmod.catnip.data.Iterate; import net.createmod.catnip.data.Pair; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/com/drmangotea/tfmg/mixin/FluidTankBlockEntityMixin.java b/src/main/java/com/drmangotea/tfmg/mixin/FluidTankBlockEntityMixin.java index 238335a4..843250ca 100644 --- a/src/main/java/com/drmangotea/tfmg/mixin/FluidTankBlockEntityMixin.java +++ b/src/main/java/com/drmangotea/tfmg/mixin/FluidTankBlockEntityMixin.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.mixin; -import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.decoration.tanks.aluminum.AluminumTankBlock; import com.drmangotea.tfmg.content.decoration.tanks.cast_iron.CastIronTankBlock; import com.drmangotea.tfmg.mixin.accessor.FluidTankBlockEntityAccessor; diff --git a/src/main/java/com/drmangotea/tfmg/mixin/GoggleOverlayRendererMixin.java b/src/main/java/com/drmangotea/tfmg/mixin/GoggleOverlayRendererMixin.java index 95a4e409..1fb32a21 100644 --- a/src/main/java/com/drmangotea/tfmg/mixin/GoggleOverlayRendererMixin.java +++ b/src/main/java/com/drmangotea/tfmg/mixin/GoggleOverlayRendererMixin.java @@ -12,7 +12,6 @@ import com.simibubi.create.content.equipment.goggles.GoggleOverlayRenderer; import com.simibubi.create.content.equipment.goggles.GogglesItem; import com.simibubi.create.foundation.gui.RemovedGuiUtils; import com.simibubi.create.foundation.mixin.accessor.MouseHandlerAccessor; -import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.config.CClient; import net.createmod.catnip.gui.element.GuiGameElement; diff --git a/src/main/java/com/drmangotea/tfmg/mixin/RecipeProviderMixin.java b/src/main/java/com/drmangotea/tfmg/mixin/RecipeProviderMixin.java index 15981c57..0d86fb63 100644 --- a/src/main/java/com/drmangotea/tfmg/mixin/RecipeProviderMixin.java +++ b/src/main/java/com/drmangotea/tfmg/mixin/RecipeProviderMixin.java @@ -1,6 +1,6 @@ package com.drmangotea.tfmg.mixin; -import com.drmangotea.tfmg.datagen.recipes.values.*; +import com.drmangotea.tfmg.datagen.recipes.values.TFMGStandardRecipeGen; import com.drmangotea.tfmg.datagen.recipes.values.create.TFMGMechanicalCraftingRecipeGen; import com.drmangotea.tfmg.datagen.recipes.values.create.TFMGSequencedAssemblyRecipeGen; import com.drmangotea.tfmg.datagen.recipes.values.tfmg.IndustrialBlastingRecipeGen; diff --git a/src/main/java/com/drmangotea/tfmg/mixin/accessor/FluidTankBlockEntityAccessor.java b/src/main/java/com/drmangotea/tfmg/mixin/accessor/FluidTankBlockEntityAccessor.java index 434be163..753d3884 100644 --- a/src/main/java/com/drmangotea/tfmg/mixin/accessor/FluidTankBlockEntityAccessor.java +++ b/src/main/java/com/drmangotea/tfmg/mixin/accessor/FluidTankBlockEntityAccessor.java @@ -1,8 +1,6 @@ package com.drmangotea.tfmg.mixin.accessor; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; -import net.minecraft.core.dispenser.DispenseItemBehavior; -import net.minecraft.world.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Invoker; diff --git a/src/main/java/com/drmangotea/tfmg/mixin/accessor/TankSegmentAccessor.java b/src/main/java/com/drmangotea/tfmg/mixin/accessor/TankSegmentAccessor.java index f7f66345..898b6d5c 100644 --- a/src/main/java/com/drmangotea/tfmg/mixin/accessor/TankSegmentAccessor.java +++ b/src/main/java/com/drmangotea/tfmg/mixin/accessor/TankSegmentAccessor.java @@ -1,11 +1,9 @@ package com.drmangotea.tfmg.mixin.accessor; -import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; import com.simibubi.create.foundation.blockEntity.behaviour.fluid.SmartFluidTankBehaviour; import com.simibubi.create.foundation.fluid.SmartFluidTank; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(SmartFluidTankBehaviour.TankSegment.class) public interface TankSegmentAccessor { diff --git a/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderPlugin.java b/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderPlugin.java index a6fc3aaa..b2ed7459 100644 --- a/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderPlugin.java +++ b/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderPlugin.java @@ -3,7 +3,10 @@ package com.drmangotea.tfmg.ponder; import com.drmangotea.tfmg.TFMG; import com.simibubi.create.foundation.ponder.PonderWorldBlockEntityFix; import net.createmod.ponder.api.level.PonderLevel; -import net.createmod.ponder.api.registration.*; +import net.createmod.ponder.api.registration.PonderPlugin; +import net.createmod.ponder.api.registration.PonderSceneRegistrationHelper; +import net.createmod.ponder.api.registration.PonderTagRegistrationHelper; +import net.createmod.ponder.api.registration.SharedTextRegistrationHelper; import net.minecraft.resources.ResourceLocation; public class TFMGPonderPlugin implements PonderPlugin { diff --git a/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderScenes.java b/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderScenes.java index 29abcdc4..cac7e540 100644 --- a/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderScenes.java +++ b/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderScenes.java @@ -1,6 +1,5 @@ package com.drmangotea.tfmg.ponder; -import com.drmangotea.tfmg.ponder.scenes.MiscTFMGScenes; import com.drmangotea.tfmg.ponder.scenes.electricity.GeneratorScenes; import com.drmangotea.tfmg.ponder.scenes.kinetics.engines.EngineScenes; import com.drmangotea.tfmg.ponder.scenes.metallurgy.BlastFurnaceScenes; diff --git a/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderTags.java b/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderTags.java index d012147c..84fc5b24 100644 --- a/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderTags.java +++ b/src/main/java/com/drmangotea/tfmg/ponder/TFMGPonderTags.java @@ -3,8 +3,6 @@ package com.drmangotea.tfmg.ponder; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGItems; -import com.simibubi.create.AllBlocks; -import com.simibubi.create.AllItems; import com.tterrag.registrate.util.entry.RegistryEntry; import net.createmod.catnip.platform.CatnipServices; import net.createmod.ponder.api.registration.PonderTagRegistrationHelper; diff --git a/src/main/java/com/drmangotea/tfmg/ponder/TFMGSceneBuilder.java b/src/main/java/com/drmangotea/tfmg/ponder/TFMGSceneBuilder.java index 22a65c5a..a7845080 100644 --- a/src/main/java/com/drmangotea/tfmg/ponder/TFMGSceneBuilder.java +++ b/src/main/java/com/drmangotea/tfmg/ponder/TFMGSceneBuilder.java @@ -1,18 +1,11 @@ package com.drmangotea.tfmg.ponder; -import com.drmangotea.tfmg.content.engines.base.EngineBlock; import com.drmangotea.tfmg.content.engines.types.regular_engine.RegularEngineBlockEntity; import com.drmangotea.tfmg.registry.TFMGItems; -import com.simibubi.create.content.fluids.pump.PumpBlockEntity; -import com.simibubi.create.content.kinetics.base.KineticBlockEntity; -import com.simibubi.create.content.kinetics.gauge.SpeedGaugeBlockEntity; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; import net.createmod.ponder.api.scene.SceneBuilder; -import net.createmod.ponder.api.scene.Selection; import net.minecraft.core.BlockPos; -import java.util.function.UnaryOperator; - public class TFMGSceneBuilder extends CreateSceneBuilder { private final TFMGWorldInstructions tfmgInstructions; diff --git a/src/main/java/com/drmangotea/tfmg/ponder/scenes/MiscTFMGScenes.java b/src/main/java/com/drmangotea/tfmg/ponder/scenes/MiscTFMGScenes.java index ce5bdc2e..068d6024 100644 --- a/src/main/java/com/drmangotea/tfmg/ponder/scenes/MiscTFMGScenes.java +++ b/src/main/java/com/drmangotea/tfmg/ponder/scenes/MiscTFMGScenes.java @@ -1,13 +1,8 @@ package com.drmangotea.tfmg.ponder.scenes; -import com.drmangotea.tfmg.ponder.TFMGSceneBuilder; -import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.drmangotea.tfmg.registry.TFMGItems; -import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; import net.createmod.catnip.math.Pointing; -import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; import net.createmod.ponder.api.element.WorldSectionElement; import net.createmod.ponder.api.scene.SceneBuilder; diff --git a/src/main/java/com/drmangotea/tfmg/ponder/scenes/metallurgy/PumpjackScenes.java b/src/main/java/com/drmangotea/tfmg/ponder/scenes/metallurgy/PumpjackScenes.java index 702ce825..7eff8c34 100644 --- a/src/main/java/com/drmangotea/tfmg/ponder/scenes/metallurgy/PumpjackScenes.java +++ b/src/main/java/com/drmangotea/tfmg/ponder/scenes/metallurgy/PumpjackScenes.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.ponder.scenes.metallurgy; import com.simibubi.create.AllItems; import com.simibubi.create.foundation.ponder.CreateSceneBuilder; -import com.simibubi.create.infrastructure.ponder.scenes.BearingScenes; import net.createmod.catnip.math.Pointing; import net.createmod.ponder.api.PonderPalette; import net.createmod.ponder.api.element.ElementLink; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/DistillationRecipe.java b/src/main/java/com/drmangotea/tfmg/recipes/DistillationRecipe.java index b20b1451..b7c7a7a0 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/DistillationRecipe.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/DistillationRecipe.java @@ -1,14 +1,11 @@ package com.drmangotea.tfmg.recipes; - - import com.drmangotea.tfmg.registry.TFMGRecipeTypes; import com.simibubi.create.content.processing.recipe.ProcessingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.foundation.fluid.FluidIngredient; import com.simibubi.create.foundation.item.SmartInventory; -import net.minecraft.core.NonNullList; import net.minecraft.world.level.Level; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.templates.FluidTank; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/HotBlastRecipe.java b/src/main/java/com/drmangotea/tfmg/recipes/HotBlastRecipe.java index 37d32dd0..28000ecf 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/HotBlastRecipe.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/HotBlastRecipe.java @@ -1,12 +1,9 @@ package com.drmangotea.tfmg.recipes; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.google.gson.JsonObject; import com.simibubi.create.content.processing.recipe.ProcessingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.foundation.fluid.FluidIngredient; -import net.minecraft.util.GsonHelper; -import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.Level; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.items.wrapper.RecipeWrapper; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/PolarizingRecipe.java b/src/main/java/com/drmangotea/tfmg/recipes/PolarizingRecipe.java index a44c8a16..e40f977e 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/PolarizingRecipe.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/PolarizingRecipe.java @@ -3,16 +3,12 @@ package com.drmangotea.tfmg.recipes; import com.drmangotea.tfmg.recipes.jei.PolarizingCategory; import com.drmangotea.tfmg.registry.TFMGBlocks; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.google.gson.JsonObject; import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory; import com.simibubi.create.content.processing.recipe.ProcessingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe; - import com.simibubi.create.foundation.utility.CreateLang; -import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.chat.Component; -import net.minecraft.util.GsonHelper; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/WindingRecipe.java b/src/main/java/com/drmangotea/tfmg/recipes/WindingRecipe.java index fa97eb41..cbd347ec 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/WindingRecipe.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/WindingRecipe.java @@ -7,13 +7,11 @@ import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemb import com.simibubi.create.content.processing.recipe.ProcessingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeParams; import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe; - import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.network.chat.Component; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.Level; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.items.wrapper.RecipeWrapper; import java.util.List; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/CastingCategory.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/CastingCategory.java index 780e8a35..b3563292 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/CastingCategory.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/CastingCategory.java @@ -3,10 +3,8 @@ package com.drmangotea.tfmg.recipes.jei; import com.drmangotea.tfmg.recipes.CastingRecipe; import com.drmangotea.tfmg.recipes.jei.machines.CastingSetup; -import com.drmangotea.tfmg.registry.TFMGItems; import com.simibubi.create.compat.jei.category.CreateRecipeCategory; import com.simibubi.create.foundation.gui.AllGuiTextures; -import mezz.jei.api.forge.ForgeTypes; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.IFocusGroup; @@ -14,7 +12,6 @@ import mezz.jei.api.recipe.RecipeIngredientRole; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.core.RegistryAccess; -import net.minecraft.world.item.ItemStack; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/CokingCategory.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/CokingCategory.java index 0d398156..14f6edc9 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/CokingCategory.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/CokingCategory.java @@ -2,18 +2,13 @@ package com.drmangotea.tfmg.recipes.jei; import com.drmangotea.tfmg.recipes.CokingRecipe; import com.drmangotea.tfmg.recipes.jei.machines.CokeOven; -import com.drmangotea.tfmg.registry.TFMGFluids; import com.simibubi.create.compat.jei.category.CreateRecipeCategory; import com.simibubi.create.foundation.gui.AllGuiTextures; -import mezz.jei.api.forge.ForgeTypes; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.RecipeIngredientRole; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; -import net.minecraft.core.RegistryAccess; -import net.minecraftforge.fluids.FluidStack; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/DistillationCategory.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/DistillationCategory.java index e1e289fc..e4020048 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/DistillationCategory.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/DistillationCategory.java @@ -5,11 +5,9 @@ import com.drmangotea.tfmg.registry.TFMGGuiTextures; import com.simibubi.create.compat.jei.category.CreateRecipeCategory; import com.simibubi.create.foundation.fluid.FluidIngredient; import com.simibubi.create.foundation.gui.AllGuiTextures; -import mezz.jei.api.forge.ForgeTypes; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.IFocusGroup; -import mezz.jei.api.recipe.RecipeIngredientRole; import net.minecraft.client.gui.GuiGraphics; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/HotBlastCategory.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/HotBlastCategory.java index e5796589..520cfdda 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/HotBlastCategory.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/HotBlastCategory.java @@ -1,18 +1,13 @@ package com.drmangotea.tfmg.recipes.jei; -import com.drmangotea.tfmg.recipes.DistillationRecipe; import com.drmangotea.tfmg.recipes.HotBlastRecipe; import com.drmangotea.tfmg.registry.TFMGGuiTextures; import com.simibubi.create.compat.jei.category.CreateRecipeCategory; -import com.simibubi.create.foundation.fluid.FluidIngredient; import com.simibubi.create.foundation.gui.AllGuiTextures; -import mezz.jei.api.forge.ForgeTypes; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.IFocusGroup; -import mezz.jei.api.recipe.RecipeIngredientRole; import net.minecraft.client.gui.GuiGraphics; -import net.minecraftforge.fluids.FluidStack; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/PolarizingCategory.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/PolarizingCategory.java index 0f88d053..2d1c4a87 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/PolarizingCategory.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/PolarizingCategory.java @@ -1,21 +1,16 @@ package com.drmangotea.tfmg.recipes.jei; -import com.drmangotea.tfmg.base.TFMGUtils; import com.drmangotea.tfmg.recipes.PolarizingRecipe; import com.drmangotea.tfmg.recipes.jei.machines.Polarizer; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.compat.jei.category.CreateRecipeCategory; import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory; -import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe; import com.simibubi.create.content.processing.sequenced.SequencedRecipe; import com.simibubi.create.foundation.gui.AllGuiTextures; - import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; -import mezz.jei.api.gui.builder.IRecipeSlotBuilder; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.RecipeIngredientRole; -import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/TFMGJei.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/TFMGJei.java index 7102a127..5ae466b8 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/TFMGJei.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/TFMGJei.java @@ -1,12 +1,25 @@ package com.drmangotea.tfmg.recipes.jei; import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.recipes.*; +import com.drmangotea.tfmg.recipes.CastingRecipe; +import com.drmangotea.tfmg.recipes.CokingRecipe; +import com.drmangotea.tfmg.recipes.DistillationRecipe; +import com.drmangotea.tfmg.recipes.HotBlastRecipe; +import com.drmangotea.tfmg.recipes.IndustrialBlastingRecipe; +import com.drmangotea.tfmg.recipes.PolarizingRecipe; +import com.drmangotea.tfmg.recipes.VatMachineRecipe; +import com.drmangotea.tfmg.recipes.WindingRecipe; import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.drmangotea.tfmg.registry.TFMGFluids; import com.drmangotea.tfmg.registry.TFMGItems; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.simibubi.create.compat.jei.*; +import com.simibubi.create.compat.jei.BlueprintTransferHandler; +import com.simibubi.create.compat.jei.CreateJEI; +import com.simibubi.create.compat.jei.DoubleItemIcon; +import com.simibubi.create.compat.jei.EmptyBackground; +import com.simibubi.create.compat.jei.GhostIngredientHandler; +import com.simibubi.create.compat.jei.ItemIcon; +import com.simibubi.create.compat.jei.SlotMover; +import com.simibubi.create.compat.jei.ToolboxColoringRecipeMaker; import com.simibubi.create.compat.jei.category.CreateRecipeCategory; import com.simibubi.create.content.equipment.blueprint.BlueprintScreen; import com.simibubi.create.content.logistics.filter.AbstractFilterScreen; @@ -22,7 +35,11 @@ import mezz.jei.api.JeiPlugin; import mezz.jei.api.constants.RecipeTypes; import mezz.jei.api.gui.drawable.IDrawable; import mezz.jei.api.recipe.category.IRecipeCategory; -import mezz.jei.api.registration.*; +import mezz.jei.api.registration.IGuiHandlerRegistration; +import mezz.jei.api.registration.IRecipeCatalystRegistration; +import mezz.jei.api.registration.IRecipeCategoryRegistration; +import mezz.jei.api.registration.IRecipeRegistration; +import mezz.jei.api.registration.IRecipeTransferRegistration; import mezz.jei.api.runtime.IIngredientManager; import net.createmod.catnip.config.ConfigBase; import net.minecraft.client.Minecraft; @@ -35,7 +52,11 @@ import net.minecraft.world.level.block.Blocks; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Predicate; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/WindingCategory.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/WindingCategory.java index 1b7c3cc0..e1b15af4 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/WindingCategory.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/WindingCategory.java @@ -1,28 +1,21 @@ package com.drmangotea.tfmg.recipes.jei; import com.drmangotea.tfmg.content.machinery.misc.winding_machine.SpoolItem; -import com.drmangotea.tfmg.recipes.PolarizingRecipe; import com.drmangotea.tfmg.recipes.WindingRecipe; -import com.drmangotea.tfmg.recipes.jei.machines.Polarizer; import com.drmangotea.tfmg.recipes.jei.machines.WindingMachine; -import dev.engine_room.flywheel.lib.model.baked.PartialModel; import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.compat.jei.category.CreateRecipeCategory; import com.simibubi.create.compat.jei.category.animations.AnimatedDeployer; import com.simibubi.create.compat.jei.category.sequencedAssembly.SequencedAssemblySubCategory; -import com.simibubi.create.content.processing.sequenced.IAssemblyRecipe; import com.simibubi.create.content.processing.sequenced.SequencedRecipe; import com.simibubi.create.foundation.gui.AllGuiTextures; -import net.createmod.catnip.render.CachedBuffers; import mezz.jei.api.gui.builder.IRecipeLayoutBuilder; -import mezz.jei.api.gui.builder.IRecipeSlotBuilder; import mezz.jei.api.gui.ingredient.IRecipeSlotsView; import mezz.jei.api.recipe.IFocusGroup; import mezz.jei.api.recipe.RecipeIngredientRole; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.crafting.Ingredient; public class WindingCategory extends CreateRecipeCategory { private final WindingMachine windingMachine = new WindingMachine(); diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/BlastFurnace.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/BlastFurnace.java index eeb3d121..2b61c05c 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/BlastFurnace.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/BlastFurnace.java @@ -5,11 +5,13 @@ import com.drmangotea.tfmg.registry.TFMGBlocks; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics; -import com.simibubi.create.content.processing.burner.BlazeBurnerBlock; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.world.level.block.state.properties.WallSide; -import static net.minecraft.world.level.block.WallBlock.*; +import static net.minecraft.world.level.block.WallBlock.EAST_WALL; +import static net.minecraft.world.level.block.WallBlock.NORTH_WALL; +import static net.minecraft.world.level.block.WallBlock.SOUTH_WALL; +import static net.minecraft.world.level.block.WallBlock.WEST_WALL; public class BlastFurnace extends AnimatedKinetics { diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/CastingSetup.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/CastingSetup.java index db78eafe..60bd8857 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/CastingSetup.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/CastingSetup.java @@ -2,7 +2,6 @@ package com.drmangotea.tfmg.recipes.jei.machines; import com.drmangotea.tfmg.registry.TFMGBlocks; -import com.drmangotea.tfmg.registry.TFMGPartialModels; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/WindingMachine.java b/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/WindingMachine.java index 488c0b70..54eddbec 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/WindingMachine.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/jei/machines/WindingMachine.java @@ -8,7 +8,6 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.simibubi.create.AllPartialModels; import com.simibubi.create.compat.jei.category.animations.AnimatedKinetics; import com.simibubi.create.foundation.gui.AllGuiTextures; -import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.gui.element.GuiGameElement; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.core.Direction; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java index 762bccab..6fccc35b 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java @@ -1,13 +1,15 @@ package com.drmangotea.tfmg.registry; import com.drmangotea.tfmg.base.HalfShaftRenderer; -import com.drmangotea.tfmg.content.decoration.cogs.*; +import com.drmangotea.tfmg.content.decoration.cogs.TFMGCogwheelRenderer; +import com.drmangotea.tfmg.content.decoration.cogs.TFMGCogwheelVisual; +import com.drmangotea.tfmg.content.decoration.cogs.TFMGEncasedCogRenderer; +import com.drmangotea.tfmg.content.decoration.cogs.TFMGEncasedCogVisual; import com.drmangotea.tfmg.content.decoration.doors.TFMGSlidingDoorBlockEntity; import com.drmangotea.tfmg.content.decoration.doors.TFMGSlidingDoorRenderer; import com.drmangotea.tfmg.content.decoration.flywheels.TFMGFlywheelBlockEntity; import com.drmangotea.tfmg.content.decoration.flywheels.TFMGFlywheelRenderer; import com.drmangotea.tfmg.content.decoration.flywheels.TFMGFlywheelVisual; -import com.drmangotea.tfmg.content.decoration.pipes.TFMGEncasedPipeBlock; import com.drmangotea.tfmg.content.decoration.pipes.TFMGPipeBlockEntity; import com.drmangotea.tfmg.content.decoration.pipes.TFMGPipes; import com.drmangotea.tfmg.content.decoration.tanks.TFMGFluidTankRenderer; @@ -57,7 +59,6 @@ import com.drmangotea.tfmg.content.engines.base.EngineRenderer; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerBlockEntity; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerRenderer; import com.drmangotea.tfmg.content.engines.engine_gearbox.EngineGearboxBlockEntity; -import com.drmangotea.tfmg.content.engines.engine_gearbox.EngineGearboxRenderer; import com.drmangotea.tfmg.content.engines.types.large_engine.LargeEngineBlockEntity; import com.drmangotea.tfmg.content.engines.types.large_engine.LargeEngineRenderer; import com.drmangotea.tfmg.content.engines.types.radial_engine.RadialEngineBlockEntity; @@ -76,8 +77,8 @@ import com.drmangotea.tfmg.content.machinery.metallurgy.coke_oven.CokeOvenRender import com.drmangotea.tfmg.content.machinery.misc.air_intake.AirIntakeBlockEntity; import com.drmangotea.tfmg.content.machinery.misc.air_intake.AirIntakeRenderer; import com.drmangotea.tfmg.content.machinery.misc.concrete_hose.ConcreteHoseBlockEntity; -import com.drmangotea.tfmg.content.machinery.misc.concrete_hose.ConcreteHoseVisual; import com.drmangotea.tfmg.content.machinery.misc.concrete_hose.ConcreteHoseRenderer; +import com.drmangotea.tfmg.content.machinery.misc.concrete_hose.ConcreteHoseVisual; import com.drmangotea.tfmg.content.machinery.misc.exhaust.ExhaustBlockEntity; import com.drmangotea.tfmg.content.machinery.misc.firebox.FireboxBlockEntity; import com.drmangotea.tfmg.content.machinery.misc.flarestack.FlarestackBlockEntity; @@ -115,7 +116,11 @@ import com.simibubi.create.content.fluids.pipes.valve.FluidValveVisual; import com.simibubi.create.content.fluids.pump.PumpBlockEntity; import com.simibubi.create.content.fluids.pump.PumpRenderer; import com.simibubi.create.content.fluids.tank.FluidTankBlockEntity; -import com.simibubi.create.content.kinetics.base.*; +import com.simibubi.create.content.kinetics.base.KineticBlockEntity; +import com.simibubi.create.content.kinetics.base.OrientedRotatingVisual; +import com.simibubi.create.content.kinetics.base.ShaftRenderer; +import com.simibubi.create.content.kinetics.base.ShaftVisual; +import com.simibubi.create.content.kinetics.base.SingleAxisRotatingVisual; import com.simibubi.create.content.kinetics.gearbox.GearboxBlockEntity; import com.simibubi.create.content.kinetics.gearbox.GearboxRenderer; import com.simibubi.create.content.kinetics.gearbox.GearboxVisual; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java index e8a7a828..bb942d29 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java @@ -1,18 +1,32 @@ package com.drmangotea.tfmg.registry; -import com.drmangotea.tfmg.TFMGClient; -import com.drmangotea.tfmg.base.*; +import com.drmangotea.tfmg.base.MaterialSet; +import com.drmangotea.tfmg.base.TFMGBuilderTransformers; +import com.drmangotea.tfmg.base.TFMGCreativeTabs; +import com.drmangotea.tfmg.base.TFMGMetalBarsGen; +import com.drmangotea.tfmg.base.TFMGShapes; +import com.drmangotea.tfmg.base.TFMGSpriteShifts; import com.drmangotea.tfmg.base.blocks.TFMGDirectionalBlock; import com.drmangotea.tfmg.base.blocks.TFMGVanillaBlockStates; import com.drmangotea.tfmg.config.TFMGStress; -import com.drmangotea.tfmg.content.decoration.*; +import com.drmangotea.tfmg.content.decoration.FrameBlock; +import com.drmangotea.tfmg.content.decoration.LithiumBlock; +import com.drmangotea.tfmg.content.decoration.LithiumTorchBlock; +import com.drmangotea.tfmg.content.decoration.LithiumTorchGenerator; +import com.drmangotea.tfmg.content.decoration.TrussBlock; import com.drmangotea.tfmg.content.decoration.cogs.TFMGCogWheelBlock; import com.drmangotea.tfmg.content.decoration.cogs.TFMGCogwheelBlockItem; -import com.drmangotea.tfmg.content.decoration.concrete.*; +import com.drmangotea.tfmg.content.decoration.concrete.RebarFloorBlock; +import com.drmangotea.tfmg.content.decoration.concrete.RebarPillarBlock; +import com.drmangotea.tfmg.content.decoration.concrete.RebarStairsBlock; +import com.drmangotea.tfmg.content.decoration.concrete.RebarStairsGenerator; +import com.drmangotea.tfmg.content.decoration.concrete.RebarWallBlock; +import com.drmangotea.tfmg.content.decoration.concrete.SimpleConcreteloggedBlock; import com.drmangotea.tfmg.content.decoration.doors.TFMGSlidingDoorBlock; import com.drmangotea.tfmg.content.decoration.flywheels.TFMGFlywheelBlock; import com.drmangotea.tfmg.content.decoration.gearbox.SteelGearboxBlock; +import com.drmangotea.tfmg.content.decoration.tanks.TFMGTankGenerator; import com.drmangotea.tfmg.content.decoration.tanks.aluminum.AluminumFluidTankModel; import com.drmangotea.tfmg.content.decoration.tanks.aluminum.AluminumTankBlock; import com.drmangotea.tfmg.content.decoration.tanks.aluminum.AluminumTankItem; @@ -21,7 +35,6 @@ import com.drmangotea.tfmg.content.decoration.tanks.cast_iron.CastIronTankBlock; import com.drmangotea.tfmg.content.decoration.tanks.cast_iron.CastIronTankItem; import com.drmangotea.tfmg.content.decoration.tanks.steel.SteelFluidTankModel; import com.drmangotea.tfmg.content.decoration.tanks.steel.SteelTankBlock; -import com.drmangotea.tfmg.content.decoration.tanks.TFMGTankGenerator; import com.drmangotea.tfmg.content.decoration.tanks.steel.SteelTankItem; import com.drmangotea.tfmg.content.electricity.connection.cable_hub.CableHubBlock; import com.drmangotea.tfmg.content.electricity.connection.cables.CableConnectorBlock; @@ -36,7 +49,6 @@ import com.drmangotea.tfmg.content.electricity.generators.creative_generator.Cre import com.drmangotea.tfmg.content.electricity.generators.large_generator.RotorBlock; import com.drmangotea.tfmg.content.electricity.generators.large_generator.StatorBlock; import com.drmangotea.tfmg.content.electricity.generators.large_generator.StatorGenerator; -import com.drmangotea.tfmg.content.machinery.misc.gas_lamp.GasLampBlock; import com.drmangotea.tfmg.content.electricity.lights.LampGenerator; import com.drmangotea.tfmg.content.electricity.lights.LightBulbBlock; import com.drmangotea.tfmg.content.electricity.lights.neon_tube.NeonTubeBlock; @@ -52,8 +64,8 @@ import com.drmangotea.tfmg.content.electricity.utilities.electric_motor.Electric import com.drmangotea.tfmg.content.electricity.utilities.electric_pump.ElectricPumpBlock; import com.drmangotea.tfmg.content.electricity.utilities.electric_switch.ElectricSwitchBlock; import com.drmangotea.tfmg.content.electricity.utilities.polarizer.PolarizerBlock; -import com.drmangotea.tfmg.content.electricity.utilities.potentiometer.PotentiometerBlock; import com.drmangotea.tfmg.content.electricity.utilities.potentiometer.EncasedPotentiometerBlock; +import com.drmangotea.tfmg.content.electricity.utilities.potentiometer.PotentiometerBlock; import com.drmangotea.tfmg.content.electricity.utilities.resistor.ResistorBlock; import com.drmangotea.tfmg.content.electricity.utilities.resistor.ResistorBlockItem; import com.drmangotea.tfmg.content.electricity.utilities.segmented_display.SegmentedDisplayBlock; @@ -91,6 +103,7 @@ import com.drmangotea.tfmg.content.machinery.misc.exhaust.ExhaustBlock; import com.drmangotea.tfmg.content.machinery.misc.firebox.FireboxBlock; import com.drmangotea.tfmg.content.machinery.misc.flarestack.FlarestackBlock; import com.drmangotea.tfmg.content.machinery.misc.flarestack.FlarestackGenerator; +import com.drmangotea.tfmg.content.machinery.misc.gas_lamp.GasLampBlock; import com.drmangotea.tfmg.content.machinery.misc.gas_lamp.GasLampGenerator; import com.drmangotea.tfmg.content.machinery.misc.machine_input.MachineInputBlock; import com.drmangotea.tfmg.content.machinery.misc.smokestack.SmokestackBlock; @@ -131,7 +144,12 @@ import com.simibubi.create.content.kinetics.gearbox.GearboxBlock; import com.simibubi.create.content.kinetics.motor.CreativeMotorGenerator; import com.simibubi.create.content.kinetics.simpleRelays.BracketedKineticBlockModel; import com.simibubi.create.foundation.block.connected.HorizontalCTBehaviour; -import com.simibubi.create.foundation.data.*; +import com.simibubi.create.foundation.data.AssetLookup; +import com.simibubi.create.foundation.data.BlockStateGen; +import com.simibubi.create.foundation.data.BuilderTransformers; +import com.simibubi.create.foundation.data.CreateRegistrate; +import com.simibubi.create.foundation.data.SharedProperties; +import com.simibubi.create.foundation.data.recipe.CommonMetal; import com.tterrag.registrate.providers.loot.RegistrateBlockLootTables; import com.tterrag.registrate.util.DataIngredient; import com.tterrag.registrate.util.entry.BlockEntry; @@ -139,7 +157,12 @@ import net.minecraft.client.renderer.RenderType; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.tags.BlockTags; import net.minecraft.world.item.enchantment.Enchantments; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.FallingBlock; +import net.minecraft.world.level.block.IronBarsBlock; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.WallBlock; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.material.MapColor; import net.minecraft.world.level.storage.loot.entries.LootItem; @@ -149,11 +172,18 @@ import net.minecraftforge.common.Tags; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.function.Supplier; import static com.drmangotea.tfmg.TFMG.REGISTRATE; -import static com.drmangotea.tfmg.base.TFMGBuilderTransformers.*; +import static com.drmangotea.tfmg.base.TFMGBuilderTransformers.flywheel; +import static com.drmangotea.tfmg.base.TFMGBuilderTransformers.frame; +import static com.drmangotea.tfmg.base.TFMGBuilderTransformers.generateCautionBlocks; +import static com.drmangotea.tfmg.base.TFMGBuilderTransformers.generateColoredConcrete; +import static com.drmangotea.tfmg.base.TFMGBuilderTransformers.generateConcrete; +import static com.drmangotea.tfmg.base.TFMGBuilderTransformers.makeVariants; +import static com.drmangotea.tfmg.base.TFMGBuilderTransformers.truss; import static com.drmangotea.tfmg.content.electricity.lights.LightBulbBlock.LIGHT; +import static com.drmangotea.tfmg.registry.TFMGTags.TFMGBlockTags; +import static com.drmangotea.tfmg.registry.TFMGTags.TFMGItemTags; import static com.simibubi.create.api.behaviour.movement.MovementBehaviour.movementBehaviour; import static com.simibubi.create.api.contraption.storage.fluid.MountedFluidStorageType.mountedFluidStorage; import static com.simibubi.create.foundation.data.BlockStateGen.axisBlock; @@ -161,7 +191,9 @@ import static com.simibubi.create.foundation.data.BlockStateGen.simpleCubeAll; import static com.simibubi.create.foundation.data.CreateRegistrate.casingConnectivity; import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures; import static com.simibubi.create.foundation.data.ModelGen.customItemModel; -import static com.simibubi.create.foundation.data.TagGen.*; +import static com.simibubi.create.foundation.data.TagGen.axeOnly; +import static com.simibubi.create.foundation.data.TagGen.axeOrPickaxe; +import static com.simibubi.create.foundation.data.TagGen.pickaxeOnly; import static com.simibubi.create.foundation.data.TagGen.tagBlockAndItem; import static com.drmangotea.tfmg.registry.TFMGTags.forgeBlockTag; import static com.drmangotea.tfmg.registry.TFMGTags.forgeItemTag; @@ -325,11 +357,11 @@ public class TFMGBlocks { .register(); public static final BlockEntry INDUSTRIAL_PIPE = REGISTRATE.block("industrial_pipe", IndustrialPipeBlock::new) .initialProperties(() -> Blocks.STONE) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .properties(p -> p.sound(SoundType.STONE)) .transform(pickaxeOnly()) - .tag(TFMGTags.TFMGBlockTags.INDUSTRIAL_PIPE.tag) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("ingots/steel")), RecipeCategory.BUILDING_BLOCKS, c::get, 8)) + .tag(TFMGBlockTags.INDUSTRIAL_PIPE.tag) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.STEEL.ingots), RecipeCategory.BUILDING_BLOCKS, c, 8)) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov))) .item() .build() @@ -340,7 +372,7 @@ public class TFMGBlocks { .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .transform(pickaxeOnly()) .loot((lt, block) -> lt.dropOther(block, TFMGBlocks.INDUSTRIAL_PIPE.get().asItem())) - .tag(TFMGTags.TFMGBlockTags.INDUSTRIAL_PIPE.tag) + .tag(TFMGBlockTags.INDUSTRIAL_PIPE.tag) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov))) .register(); @@ -376,9 +408,9 @@ public class TFMGBlocks { .transform(pickaxeOnly()) .properties(BlockBehaviour.Properties::noOcclusion) .blockstate(BlockStateGen.horizontalBlockProvider(false)) - .tag(TFMGTags.TFMGBlockTags.PUMPJACK_SMALL_PART.tag) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("storage_blocks/steel")), - RecipeCategory.DECORATIONS, c::get, 2)) + .tag(TFMGBlockTags.PUMPJACK_SMALL_PART.tag) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.STEEL.storageBlocks.items()), + RecipeCategory.DECORATIONS, c, 2)) .item() .build() .register(); @@ -387,7 +419,7 @@ public class TFMGBlocks { .transform(pickaxeOnly()) .properties(BlockBehaviour.Properties::noOcclusion) .blockstate(BlockStateGen.horizontalBlockProvider(false)) - .tag(TFMGTags.TFMGBlockTags.PUMPJACK_HEAD.tag) + .tag(TFMGBlockTags.PUMPJACK_HEAD.tag) .item() @@ -399,7 +431,7 @@ public class TFMGBlocks { .transform(pickaxeOnly()) .properties(BlockBehaviour.Properties::noOcclusion) .blockstate(BlockStateGen.horizontalBlockProvider(false)) - .tag(TFMGTags.TFMGBlockTags.PUMPJACK_CONNECTOR.tag) + .tag(TFMGBlockTags.PUMPJACK_CONNECTOR.tag) .item() .build() .register(); @@ -407,9 +439,9 @@ public class TFMGBlocks { .initialProperties(() -> Blocks.IRON_BLOCK) .transform(pickaxeOnly()) .blockstate(BlockStateGen.horizontalBlockProvider(false)) - .tag(TFMGTags.TFMGBlockTags.PUMPJACK_PART.tag) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("storage_blocks/steel")), - RecipeCategory.DECORATIONS, c::get, 2)) + .tag(TFMGBlockTags.PUMPJACK_PART.tag) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.STEEL.storageBlocks.items()), + RecipeCategory.DECORATIONS, c, 2)) .item() .build() .register(); @@ -418,7 +450,7 @@ public class TFMGBlocks { .initialProperties(() -> Blocks.IRON_BLOCK) .transform(pickaxeOnly()) .blockstate(BlockStateGen.horizontalBlockProvider(false)) - .tag(TFMGTags.TFMGBlockTags.PUMPJACK_HEAD.tag) + .tag(TFMGBlockTags.PUMPJACK_HEAD.tag) .item() .build() .register(); @@ -426,7 +458,7 @@ public class TFMGBlocks { .initialProperties(() -> Blocks.IRON_BLOCK) .transform(pickaxeOnly()) .blockstate(BlockStateGen.horizontalBlockProvider(false)) - .tag(TFMGTags.TFMGBlockTags.PUMPJACK_CONNECTOR.tag) + .tag(TFMGBlockTags.PUMPJACK_CONNECTOR.tag) .item() .build() .register(); @@ -441,9 +473,9 @@ public class TFMGBlocks { public static final BlockEntry OIL_DEPOSIT = REGISTRATE.block("oil_deposit", Block::new) .initialProperties(() -> Blocks.BEDROCK) .properties(p -> p.strength(69696969)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) - .tag(TFMGTags.TFMGBlockTags.SURFACE_SCANNER_FINDABLE.tag) + .tag(TFMGBlockTags.SURFACE_SCANNER_FINDABLE.tag) .tag(BlockTags.WITHER_IMMUNE) .tag(BlockTags.DRAGON_IMMUNE) .tag(BlockTags.DRAGON_IMMUNE) @@ -527,12 +559,11 @@ public class TFMGBlocks { lt.applyExplosionDecay(b, LootItem.lootTableItem(TFMGItems.RAW_LEAD.get()) .apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE)))))) .tag(BlockTags.NEEDS_STONE_TOOL) - .tag(Tags.Blocks.ORES) - .tag(forgeBlockTag("ores/lead")) - .tag(forgeBlockTag("ores_in_ground/stone")) - .transform(tagBlockAndItem(forgeBlockTag("ores/lead"), forgeItemTag("ores/lead"))) - .tag(forgeItemTag("ores_in_ground/stone")) - .tag(Tags.Items.ORES) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.ORES, Tags.Items.ORES, + CommonMetal.LEAD.ores.blocks(), CommonMetal.LEAD.ores.items(), + Tags.Blocks.ORES_IN_GROUND_STONE, Tags.Items.ORES_IN_GROUND_STONE + ))) .build() .register(); @@ -547,12 +578,11 @@ public class TFMGBlocks { lt.applyExplosionDecay(b, LootItem.lootTableItem(TFMGItems.RAW_LEAD.get()) .apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE)))))) .tag(BlockTags.NEEDS_STONE_TOOL) - .tag(Tags.Blocks.ORES) - .tag(forgeBlockTag("ores/lead")) - .tag(forgeBlockTag("ores_in_ground/deepslate")) - .transform(tagBlockAndItem(forgeBlockTag("ores/lead"), forgeItemTag("ores/lead"))) - .tag(forgeItemTag("ores_in_ground/deepslate")) - .tag(Tags.Items.ORES) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.ORES, Tags.Items.ORES, + CommonMetal.LEAD.ores.blocks(), CommonMetal.LEAD.ores.items(), + Tags.Blocks.ORES_IN_GROUND_DEEPSLATE, Tags.Items.ORES_IN_GROUND_DEEPSLATE + ))) .build() .register(); @@ -567,12 +597,11 @@ public class TFMGBlocks { lt.applyExplosionDecay(b, LootItem.lootTableItem(TFMGItems.RAW_NICKEL.get()) .apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE)))))) .tag(BlockTags.NEEDS_STONE_TOOL) - .tag(Tags.Blocks.ORES) - .tag(forgeBlockTag("ores/nickel")) - .tag(forgeBlockTag("ores_in_ground/stone")) - .transform(tagBlockAndItem(forgeBlockTag("ores/nickel"), forgeItemTag("ores/nickel"))) - .tag(forgeItemTag("ores_in_ground/stone")) - .tag(Tags.Items.ORES) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.ORES, Tags.Items.ORES, + CommonMetal.NICKEL.ores.blocks(), CommonMetal.NICKEL.ores.items(), + Tags.Blocks.ORES_IN_GROUND_STONE, Tags.Items.ORES_IN_GROUND_STONE + ))) .build() .register(); @@ -587,12 +616,11 @@ public class TFMGBlocks { lt.applyExplosionDecay(b, LootItem.lootTableItem(TFMGItems.RAW_NICKEL.get()) .apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE)))))) .tag(BlockTags.NEEDS_STONE_TOOL) - .tag(Tags.Blocks.ORES) - .tag(forgeBlockTag("ores/nickel")) - .tag(forgeBlockTag("ores_in_ground/deepslate")) - .transform(tagBlockAndItem(forgeBlockTag("ores/nickel"), forgeItemTag("ores/nickel"))) - .tag(forgeItemTag("ores_in_ground/deepslate")) - .tag(Tags.Items.ORES) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.ORES, Tags.Items.ORES, + CommonMetal.NICKEL.ores.blocks(), CommonMetal.NICKEL.ores.items(), + Tags.Blocks.ORES_IN_GROUND_DEEPSLATE, Tags.Items.ORES_IN_GROUND_DEEPSLATE + ))) .build() .register(); @@ -607,12 +635,11 @@ public class TFMGBlocks { lt.applyExplosionDecay(b, LootItem.lootTableItem(TFMGItems.RAW_LITHIUM.get()) .apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE)))))) .tag(BlockTags.NEEDS_STONE_TOOL) - .tag(Tags.Blocks.ORES) - .tag(forgeBlockTag("ores/lithium")) - .tag(forgeBlockTag("ores_in_ground/stone")) - .transform(tagBlockAndItem(forgeBlockTag("ores/lithium"), forgeItemTag("ores/lithium"))) - .tag(forgeItemTag("ores_in_ground/stone")) - .tag(Tags.Items.ORES) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.ORES, Tags.Items.ORES, + TFMGBlockTags.ORES_LITHIUM.tag, TFMGItemTags.ORES_LITHIUM.tag, + Tags.Blocks.ORES_IN_GROUND_STONE, Tags.Items.ORES_IN_GROUND_STONE + ))) .build() .register(); @@ -627,12 +654,11 @@ public class TFMGBlocks { lt.applyExplosionDecay(b, LootItem.lootTableItem(TFMGItems.RAW_LITHIUM.get()) .apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE)))))) .tag(BlockTags.NEEDS_STONE_TOOL) - .tag(Tags.Blocks.ORES) - .tag(forgeBlockTag("ores/lithium")) - .tag(forgeBlockTag("ores_in_ground/deepslate")) - .transform(tagBlockAndItem(forgeBlockTag("ores/lithium"), forgeItemTag("ores/lithium"))) - .tag(forgeItemTag("ores_in_ground/deepslate")) - .tag(Tags.Items.ORES) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.ORES, Tags.Items.ORES, + TFMGBlockTags.ORES_LITHIUM.tag, TFMGItemTags.ORES_LITHIUM.tag, + Tags.Blocks.ORES_IN_GROUND_DEEPSLATE, Tags.Items.ORES_IN_GROUND_DEEPSLATE + ))) .build() .register(); public static final BlockEntry SULFUR = REGISTRATE.block("sulfur", Block::new) @@ -658,7 +684,7 @@ public class TFMGBlocks { public static final BlockEntry FOSSILSTONE = REGISTRATE.block("fossilstone", Block::new) .initialProperties(() -> Blocks.OBSIDIAN) .properties(p -> p.strength(100f, 1200f)) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .item() .build() @@ -676,35 +702,38 @@ public class TFMGBlocks { .register(); public static final BlockEntry RAW_NICKEL_BLOCK = REGISTRATE.block("raw_nickel_block", Block::new) .initialProperties(() -> Blocks.RAW_GOLD_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) - .tag(Tags.Blocks.STORAGE_BLOCKS) - .tag(BlockTags.NEEDS_IRON_TOOL) .lang("Block of Raw Nickel") - .transform(tagBlockAndItem(forgeBlockTag("storage_blocks/raw_nickel"), forgeItemTag("storage_blocks/raw_nickel"))) - .tag(Tags.Items.STORAGE_BLOCKS) + .tag(BlockTags.NEEDS_IRON_TOOL) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + CommonMetal.NICKEL.rawStorageBlocks.blocks(), CommonMetal.NICKEL.rawStorageBlocks.items() + ))) .build() .register(); public static final BlockEntry RAW_LEAD_BLOCK = REGISTRATE.block("raw_lead_block", Block::new) .initialProperties(() -> Blocks.RAW_GOLD_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) - .tag(Tags.Blocks.STORAGE_BLOCKS) - .tag(BlockTags.NEEDS_IRON_TOOL) .lang("Block of Raw Lead") - .transform(tagBlockAndItem(forgeBlockTag("storage_blocks/raw_lead"), forgeItemTag("storage_blocks/raw_lead"))) - .tag(Tags.Items.STORAGE_BLOCKS) + .tag(BlockTags.NEEDS_IRON_TOOL) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + CommonMetal.LEAD.rawStorageBlocks.blocks(), CommonMetal.LEAD.rawStorageBlocks.items() + ))) .build() .register(); public static final BlockEntry RAW_LITHIUM_BLOCK = REGISTRATE.block("raw_lithium_block", Block::new) .initialProperties(() -> Blocks.RAW_GOLD_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) - .tag(Tags.Blocks.STORAGE_BLOCKS) - .tag(BlockTags.NEEDS_IRON_TOOL) .lang("Block of Raw Lithium") - .transform(tagBlockAndItem(forgeBlockTag("storage_blocks/raw_lithium"), forgeItemTag("storage_blocks/raw_lithium"))) - .tag(Tags.Items.STORAGE_BLOCKS) + .tag(BlockTags.NEEDS_IRON_TOOL) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + TFMGBlockTags.STORAGE_BLOCKS_RAW_LITHIUM.tag, TFMGItemTags.STORAGE_BLOCKS_RAW_LITHIUM.tag + ))) .build() .register(); @@ -720,7 +749,6 @@ public class TFMGBlocks { .transform(customItemModel()) .register(); - @SuppressWarnings("'addLayer(java.util.function.Supplier>)' is deprecated and marked for removal ") public static final BlockEntry FIREBOX = REGISTRATE.block("firebox", FireboxBlock::new) .initialProperties(SharedProperties::stone) @@ -777,7 +805,7 @@ public class TFMGBlocks { //------------------METALLURGY------------------// public static final BlockEntry BLAST_FURNACE_OUTPUT = REGISTRATE.block("blast_furnace_output", BlastFurnaceOutputBlock::new) .initialProperties(() -> Blocks.NETHER_BRICKS) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(BlockStateGen.horizontalBlockProvider(true)) .tag(BlockTags.NEEDS_STONE_TOOL) @@ -787,18 +815,18 @@ public class TFMGBlocks { public static final BlockEntry BLAST_FURNACE_HATCH = REGISTRATE.block("blast_furnace_hatch", BlastFurnaceHatchBlock::new) .initialProperties(() -> Blocks.NETHER_BRICKS) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) - .tag(TFMGTags.TFMGBlockTags.BLAST_FURNACE_WALL.tag) - .tag(TFMGTags.TFMGBlockTags.REINFORCED_BLAST_FURNACE_WALL.tag) + .tag(TFMGBlockTags.BLAST_FURNACE_WALL.tag) + .tag(TFMGBlockTags.REINFORCED_BLAST_FURNACE_WALL.tag) .tag(BlockTags.NEEDS_STONE_TOOL) .simpleItem() .register(); public static final BlockEntry FIREPROOF_BRICKS = REGISTRATE.block("fireproof_bricks", Block::new) .initialProperties(() -> Blocks.NETHER_BRICKS) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) - .tag(TFMGTags.TFMGBlockTags.BLAST_FURNACE_WALL.tag) + .tag(TFMGBlockTags.BLAST_FURNACE_WALL.tag) .tag(BlockTags.NEEDS_STONE_TOOL) .item() .build() @@ -806,10 +834,10 @@ public class TFMGBlocks { public static final BlockEntry BLAST_FURNACE_REINFORCEMENT = REGISTRATE.block("blast_furnace_reinforcement", Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .onRegister(connectedTextures(() -> new HorizontalCTBehaviour(TFMGSpriteShifts.BLAST_FURNACE_REINFORCEMENT))) - .tag(TFMGTags.TFMGBlockTags.REINFORCED_BLAST_FURNACE_SUPPORT.tag) + .tag(TFMGBlockTags.REINFORCED_BLAST_FURNACE_SUPPORT.tag) .tag(BlockTags.NEEDS_STONE_TOOL) .item(BlastFurnaceReinforcementBlockItem::new) .build() @@ -817,7 +845,7 @@ public class TFMGBlocks { public static final BlockEntry BLAST_FURNACE_REINFORCEMENT_WALL = REGISTRATE.block("blast_furnace_reinforcement_wall", BlastFurnaceReinforcementWallBlock::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .properties(BlockBehaviour.Properties::noOcclusion) .onRegister(connectedTextures(() -> new HorizontalCTBehaviour(TFMGSpriteShifts.BLAST_FURNACE_REINFORCEMENT))) @@ -828,10 +856,10 @@ public class TFMGBlocks { // public static final BlockEntry RUSTED_BLAST_FURNACE_REINFORCEMENT = REGISTRATE.block("rusted_blast_furnace_reinforcement", Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .onRegister(connectedTextures(() -> new HorizontalCTBehaviour(TFMGSpriteShifts.RUSTED_BLAST_FURNACE_REINFORCEMENT))) - .tag(TFMGTags.TFMGBlockTags.REINFORCED_BLAST_FURNACE_SUPPORT.tag) + .tag(TFMGBlockTags.REINFORCED_BLAST_FURNACE_SUPPORT.tag) .tag(BlockTags.NEEDS_STONE_TOOL) .item(BlastFurnaceReinforcementBlockItem::new) .build() @@ -839,7 +867,7 @@ public class TFMGBlocks { public static final BlockEntry RUSTED_BLAST_FURNACE_REINFORCEMENT_WALL = REGISTRATE.block("rusted_blast_furnace_reinforcement_wall", BlastFurnaceReinforcementWallBlock::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .properties(BlockBehaviour.Properties::noOcclusion) .onRegister(connectedTextures(() -> new HorizontalCTBehaviour(TFMGSpriteShifts.RUSTED_BLAST_FURNACE_REINFORCEMENT))) @@ -851,10 +879,10 @@ public class TFMGBlocks { public static final BlockEntry FIREPROOF_BRICK_REINFORCEMENT = REGISTRATE.block("fireproof_brick_reinforcement", WallBlock::new) .initialProperties(() -> Blocks.NETHER_BRICKS) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .tag(BlockTags.WALLS) - .tag(TFMGTags.TFMGBlockTags.BLAST_FURNACE_SUPPORT.tag) + .tag(TFMGBlockTags.BLAST_FURNACE_SUPPORT.tag) .blockstate((c, p) -> TFMGVanillaBlockStates.generateWallBlockState(c, p, "fireproof_brick_reinforcement")) .item() .transform(b -> TFMGVanillaBlockStates.transformWallItem(b, "fireproof_brick_reinforcement")) @@ -864,7 +892,7 @@ public class TFMGBlocks { public static final BlockEntry COKE_OVEN = REGISTRATE.block("coke_oven", CokeOvenBlock::new) .initialProperties(() -> Blocks.BRICKS) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .blockstate(new CokeOvenGenerator()::generate) .transform(pickaxeOnly()) .onRegister(connectedTextures(CokeOvenCTBehavior::new)) @@ -886,7 +914,7 @@ public class TFMGBlocks { public static final BlockEntry CASTING_BASIN = REGISTRATE.block("casting_basin", CastingBasinBlock::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .properties(BlockBehaviour.Properties::noOcclusion) .blockstate(BlockStateGen.horizontalBlockProvider(true)) @@ -899,7 +927,7 @@ public class TFMGBlocks { public static final BlockEntry NAPALM_BOMB = REGISTRATE.block("napalm_bomb", NapalmBombBlock::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .properties(BlockBehaviour.Properties::noOcclusion) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov))) @@ -1016,7 +1044,7 @@ public class TFMGBlocks { REGISTRATE.block("cable_tube", p -> new CableTubeBlock(p, false)) .initialProperties(() -> Blocks.IRON_BLOCK) .transform(pickaxeOnly()) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .blockstate(BlockStateGen.axisBlockProvider(false)) .item() .build() @@ -1053,7 +1081,7 @@ public class TFMGBlocks { .transform(pickaxeOnly()) .addLayer(() -> RenderType::cutoutMipped) .blockstate(new DiagonalCableGenerator()::generate) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .item() .transform(customItemModel()) .register(); @@ -1072,7 +1100,7 @@ public class TFMGBlocks { public static final BlockEntry CREATIVE_GENERATOR = REGISTRATE.block("creative_generator", CreativeGeneratorBlock::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .simpleItem() .register(); @@ -1319,7 +1347,7 @@ public class TFMGBlocks { //------------------EXHAUST/WASTE_REMOVAL------------------// public static final BlockEntry BRICK_SMOKESTACK = REGISTRATE.block("brick_smokestack", SmokestackBlock::new) .initialProperties(() -> Blocks.BRICKS) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(new SmokestackGenerator()::generate) .item() @@ -1328,7 +1356,7 @@ public class TFMGBlocks { public static final BlockEntry METAL_SMOKESTACK = REGISTRATE.block("metal_smokestack", SmokestackBlock::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(new SmokestackGenerator()::generate) .item() @@ -1337,7 +1365,7 @@ public class TFMGBlocks { public static final BlockEntry CONCRETE_SMOKESTACK = REGISTRATE.block("concrete_smokestack", SmokestackBlock::new) .initialProperties(() -> Blocks.STONE) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(new SmokestackGenerator()::generate) .item() @@ -1350,7 +1378,7 @@ public class TFMGBlocks { .addLayer(() -> RenderType::cutoutMipped) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .blockstate(BlockStateGen.directionalBlockProvider(false)) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .transform(pickaxeOnly()) .item() .transform(customItemModel()) @@ -1429,7 +1457,7 @@ public class TFMGBlocks { .transform(BuilderTransformers.casing(() -> TFMGSpriteShifts.STEEL_CASING)) .register(); public static final BlockEntry HEAVY_MACHINERY_CASING = REGISTRATE.block("heavy_machinery_casing", CasingBlock::new) - .tag(TFMGTags.TFMGBlockTags.SURFACE_SCANNER_FINDABLE.tag) + .tag(TFMGBlockTags.SURFACE_SCANNER_FINDABLE.tag) .transform(BuilderTransformers.casing(() -> TFMGSpriteShifts.HEAVY_MACHINERY_CASING)) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .register(); @@ -1442,34 +1470,36 @@ public class TFMGBlocks { public static final BlockEntry STEEL_BLOCK = REGISTRATE.block("steel_block", Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .onRegister(connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.STEEL_BLOCK))) .onRegister(casingConnectivity((block, cc) -> cc.makeCasing(block, TFMGSpriteShifts.STEEL_BLOCK))) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("steel_block")) .tag(BlockTags.NEEDS_IRON_TOOL) - .tag(TFMGTags.TFMGBlockTags.REINFORCED_BLAST_FURNACE_WALL.tag) - .tag(TFMGTags.TFMGBlockTags.REINFORCED_BLAST_FURNACE_SUPPORT.tag) - .tag(Tags.Blocks.STORAGE_BLOCKS) + .tag(TFMGBlockTags.REINFORCED_BLAST_FURNACE_WALL.tag) + .tag(TFMGBlockTags.REINFORCED_BLAST_FURNACE_SUPPORT.tag) .tag(BlockTags.BEACON_BASE_BLOCKS) - .transform(tagBlockAndItem(forgeBlockTag("storage_blocks/steel"), forgeItemTag("storage_blocks/steel"))) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + CommonMetal.STEEL.storageBlocks.blocks(), CommonMetal.STEEL.storageBlocks.items() + ))) .build() .lang("Block of Steel") .register(); public static final BlockEntry CAST_IRON_BLOCK = REGISTRATE.block("cast_iron_block", Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .onRegister(connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.CAST_IRON_BLOCK))) .onRegister(casingConnectivity((block, cc) -> cc.makeCasing(block, TFMGSpriteShifts.CAST_IRON_BLOCK))) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("cast_iron_block")) .tag(BlockTags.NEEDS_IRON_TOOL) - .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(BlockTags.BEACON_BASE_BLOCKS) - .transform(tagBlockAndItem(forgeBlockTag("storage_blocks/cast_iron"), forgeItemTag("storage_blocks/cast_iron"))) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + TFMGBlockTags.STORAGE_BLOCKS_CAST_IRON.tag, TFMGItemTags.STORAGE_BLOCKS_CAST_IRON.tag + ))) .build() .lang("Block of Cast Iron") .register(); @@ -1477,92 +1507,96 @@ public class TFMGBlocks { public static final BlockEntry ALUMINUM_BLOCK = REGISTRATE.block("aluminum_block", Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .onRegister(connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.CAST_IRON_BLOCK))) .onRegister(casingConnectivity((block, cc) -> cc.makeCasing(block, TFMGSpriteShifts.CAST_IRON_BLOCK))) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("aluminum_block")) .tag(BlockTags.NEEDS_IRON_TOOL) - .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(BlockTags.BEACON_BASE_BLOCKS) - .transform(tagBlockAndItem(forgeBlockTag("storage_blocks/aluminum"), forgeItemTag("storage_blocks/aluminum"))) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + CommonMetal.ALUMINUM.storageBlocks.blocks(), CommonMetal.ALUMINUM.storageBlocks.items() + ))) .build() .lang("Block of Aluminum") .register(); public static final BlockEntry PLASTIC_BLOCK = REGISTRATE.block("plastic_block", Block::new) .initialProperties(() -> Blocks.QUARTZ_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("plastic_block")) .tag(BlockTags.NEEDS_STONE_TOOL) - .tag(Tags.Blocks.STORAGE_BLOCKS) - .transform(tagBlockAndItem(forgeBlockTag("storage_blocks/plastic"), forgeItemTag("storage_blocks/plastic"))) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + TFMGBlockTags.STORAGE_BLOCKS_PLASTIC.tag, TFMGItemTags.STORAGE_BLOCKS_PLASTIC.tag + ))) .build() .lang("Block of Plastic") .register(); public static final BlockEntry LEAD_BLOCK = REGISTRATE.block("lead_block", Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .onRegister(connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.LEAD_BLOCK))) .onRegister(casingConnectivity((block, cc) -> cc.makeCasing(block, TFMGSpriteShifts.LEAD_BLOCK))) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("lead_block")) .tag(BlockTags.NEEDS_IRON_TOOL) - .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(BlockTags.BEACON_BASE_BLOCKS) - .transform(tagBlockAndItem(forgeBlockTag("storage_blocks/lead"), forgeItemTag("storage_blocks/lead"))) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + CommonMetal.LEAD.storageBlocks.blocks(), CommonMetal.LEAD.storageBlocks.items() + ))) .build() .lang("Block of Lead") .register(); public static final BlockEntry CONSTANTAN_BLOCK = REGISTRATE.block("constantan_block", Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("constantan_block")) .tag(BlockTags.NEEDS_IRON_TOOL) - .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(BlockTags.BEACON_BASE_BLOCKS) - .transform(tagBlockAndItem(forgeBlockTag("storage_blocks/constantan"), forgeItemTag("storage_blocks/constantan"))) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + CommonMetal.CONSTANTAN.storageBlocks.blocks(), CommonMetal.CONSTANTAN.storageBlocks.items() + ))) .build() .lang("Block of Constantan") .register(); public static final BlockEntry NICKEL_BLOCK = REGISTRATE.block("nickel_block", Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .onRegister(connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.LEAD_BLOCK))) .onRegister(casingConnectivity((block, cc) -> cc.makeCasing(block, TFMGSpriteShifts.LEAD_BLOCK))) .transform(pickaxeOnly()) .tag(BlockTags.NEEDS_IRON_TOOL) - .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(BlockTags.BEACON_BASE_BLOCKS) - .transform(tagBlockAndItem(forgeBlockTag("storage_blocks/nickel"), forgeItemTag("storage_blocks/nickel"))) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + CommonMetal.NICKEL.storageBlocks.blocks(), CommonMetal.NICKEL.storageBlocks.items() + ))) .build() .lang("Block of Nickel") .register(); public static final BlockEntry LITHIUM_BLOCK = REGISTRATE.block("lithium_block", LithiumBlock::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .onRegister(connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.LEAD_BLOCK))) .onRegister(casingConnectivity((block, cc) -> cc.makeCasing(block, TFMGSpriteShifts.LEAD_BLOCK))) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("lithium_block")) .tag(BlockTags.NEEDS_IRON_TOOL) - .tag(Tags.Blocks.STORAGE_BLOCKS) .tag(BlockTags.BEACON_BASE_BLOCKS) - .tag(AllTags.forgeBlockTag("storage_blocks/lithium")) - .item() - .tag(AllTags.forgeItemTag("storage_blocks/lithium")) - .tag(Tags.Items.STORAGE_BLOCKS) + .transform(tagBlockAndItem(Map.of( + Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS, + TFMGBlockTags.STORAGE_BLOCKS_LITHIUM.tag, TFMGItemTags.STORAGE_BLOCKS_LITHIUM.tag + ))) .build() .lang("Block of Lithium") .register(); @@ -1570,15 +1604,15 @@ public class TFMGBlocks { public static final BlockEntry COAL_COKE_BLOCK = REGISTRATE.block("coal_coke_block", Block::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("coal_coke_block")) - .tag(AllTags.forgeBlockTag("storage_blocks/coal_coke")) .tag(BlockTags.NEEDS_STONE_TOOL) .tag(Tags.Blocks.STORAGE_BLOCKS) + .tag(TFMGBlockTags.STORAGE_BLOCKS_COAL_COKE.tag) .item(CoalCokeBlockItem::new) - .tag(AllTags.forgeItemTag("storage_blocks/coal_coke")) .tag(Tags.Items.STORAGE_BLOCKS) + .tag(TFMGItemTags.STORAGE_BLOCKS_COAL_COKE.tag) .build() .lang("Block of Coal Coke") .register(); @@ -1634,7 +1668,7 @@ public class TFMGBlocks { .initialProperties(SharedProperties::stone) .transform(TFMGStress.setNoImpact()) .transform(axeOrPickaxe()) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCTBehaviour(TFMGSpriteShifts.HEAVY_MACHINERY_CASING))) .onRegister(CreateRegistrate.casingConnectivity((block, cc) -> cc.make(block, TFMGSpriteShifts.HEAVY_MACHINERY_CASING, (s, f) -> f.getAxis() == s.getValue(GearboxBlock.AXIS)))) @@ -1721,7 +1755,7 @@ public class TFMGBlocks { .strength(3.0F) .requiresCorrectToolForDrops() .sound(SoundType.CALCITE)) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(TFMGBlocks.SLAG_BLOCK.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 4)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(TFMGBlocks.SLAG_BLOCK.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 4)) .transform(pickaxeOnly()) .simpleItem() .register(); @@ -1768,7 +1802,7 @@ public class TFMGBlocks { .strength(3.0F) .requiresCorrectToolForDrops() .sound(SoundType.NETHERITE_BLOCK)) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("ingots/aluminum")), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.ALUMINUM.ingots), RecipeCategory.BUILDING_BLOCKS, c, 1)) .transform(pickaxeOnly()) .simpleItem() .register(); @@ -1788,7 +1822,7 @@ public class TFMGBlocks { public static final MaterialSet HARDENED_PLANKS_SET = makeVariants(HARDENED_PLANKS, true); public static final BlockEntry STEEL_TRAPDOOR = - REGISTRATE.block("steel_trapdoor", TrainTrapdoorBlock::new) + REGISTRATE.block("steel_trapdoor", TrainTrapdoorBlock::metal) .initialProperties(SharedProperties::softMetal) .properties(p -> p.mapColor(MapColor.TERRACOTTA_CYAN) .sound(SoundType.NETHERITE_BLOCK)) @@ -1825,7 +1859,7 @@ public class TFMGBlocks { public static final BlockEntry REBAR_BLOCK = REGISTRATE.block("rebar_block", SimpleConcreteloggedBlock::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .addLayer(() -> RenderType::cutoutMipped) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov))) @@ -1835,7 +1869,7 @@ public class TFMGBlocks { public static final BlockEntry REBAR_FLOOR = REGISTRATE.block("rebar_floor", RebarFloorBlock::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .addLayer(() -> RenderType::cutoutMipped) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov))) @@ -1845,7 +1879,7 @@ public class TFMGBlocks { public static final BlockEntry REBAR_WALL = REGISTRATE.block("rebar_wall", RebarWallBlock::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .addLayer(() -> RenderType::cutoutMipped) .blockstate((ctx, prov) -> prov.simpleBlock(ctx.getEntry(), AssetLookup.partialBaseModel(ctx, prov))) @@ -1864,7 +1898,7 @@ public class TFMGBlocks { public static final BlockEntry REBAR_STAIRS = REGISTRATE.block("rebar_stairs", p -> new RebarStairsBlock(REBAR_PILE.getDefaultState(), p)) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .addLayer(() -> RenderType::cutoutMipped) .blockstate(new RebarStairsGenerator()::generate) @@ -1875,7 +1909,7 @@ public class TFMGBlocks { public static final BlockEntry REBAR_PILLAR = REGISTRATE.block("rebar_pillar", RebarPillarBlock::new) .initialProperties(() -> Blocks.IRON_BLOCK) - .properties(p -> p.noOcclusion()) + .properties(BlockBehaviour.Properties::noOcclusion) .properties(p -> p.sound(SoundType.NETHERITE_BLOCK)) .addLayer(() -> RenderType::cutoutMipped) .blockstate(BlockStateGen.directionalBlockProvider(true)) @@ -1894,7 +1928,7 @@ public class TFMGBlocks { public static final BlockEntry ASPHALT = REGISTRATE.block("asphalt", Block::new) .initialProperties(() -> Blocks.STONE) - .properties(p -> p.requiresCorrectToolForDrops()) + .properties(BlockBehaviour.Properties::requiresCorrectToolForDrops) .transform(pickaxeOnly()) .tag(BlockTags.NEEDS_STONE_TOOL) .item() diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGEntityTypes.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGEntityTypes.java index bbfbaa7b..7bb8f805 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGEntityTypes.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGEntityTypes.java @@ -2,7 +2,14 @@ package com.drmangotea.tfmg.registry; import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.base.spark.*; +import com.drmangotea.tfmg.base.spark.BlueSpark; +import com.drmangotea.tfmg.base.spark.BlueSparkRenderer; +import com.drmangotea.tfmg.base.spark.DryIceFlake; +import com.drmangotea.tfmg.base.spark.DryIceFlakeRenderer; +import com.drmangotea.tfmg.base.spark.GreenSpark; +import com.drmangotea.tfmg.base.spark.GreenSparkRenderer; +import com.drmangotea.tfmg.base.spark.Spark; +import com.drmangotea.tfmg.base.spark.SparkRenderer; import com.drmangotea.tfmg.content.items.weapons.advanced_potato_cannon.projectile.NapalmPotato; import com.drmangotea.tfmg.content.items.weapons.advanced_potato_cannon.projectile.NapalmPotatoRenderer; import com.drmangotea.tfmg.content.items.weapons.explosives.napalm.NapalmBombEntity; @@ -14,7 +21,6 @@ import com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.Th import com.drmangotea.tfmg.content.items.weapons.lithium_blade.LithiumSpark; import com.drmangotea.tfmg.content.items.weapons.lithium_blade.LithiumSparkRenderer; import com.simibubi.create.foundation.data.CreateEntityBuilder; - import com.simibubi.create.foundation.utility.CreateLang; import com.tterrag.registrate.util.entry.EntityEntry; import com.tterrag.registrate.util.nullness.NonNullConsumer; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java index 1966f669..f09d2775 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java @@ -7,7 +7,6 @@ import com.drmangotea.tfmg.base.fluid.AsphaltFluid; import com.drmangotea.tfmg.base.fluid.ConcreteFluid; import com.drmangotea.tfmg.base.fluid.HotFluidType; import com.simibubi.create.AllFluids; -import com.simibubi.create.AllTags; import com.simibubi.create.content.fluids.VirtualFluid; import com.tterrag.registrate.builders.FluidBuilder; import com.tterrag.registrate.util.entry.FluidEntry; @@ -15,6 +14,7 @@ import com.tterrag.registrate.util.nullness.NonNullFunction; import net.createmod.catnip.theme.Color; import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.material.Fluid; @@ -79,7 +79,7 @@ public class TFMGFluids { .tag(tags) .source(ForgeFlowingFluid.Source::new) .bucket() - .tag(AllTags.forgeItemTag("buckets/" + name)) + .tag(ItemTags.create(ResourceLocation.fromNamespaceAndPath("forge", "buckets/" + name))) .build() .register(); } @@ -97,7 +97,7 @@ public class TFMGFluids { .tag(tags) .source(ForgeFlowingFluid.Source::new) .bucket() - .tag(AllTags.forgeItemTag("buckets/" + name)) + .tag(ItemTags.create(ResourceLocation.fromNamespaceAndPath("forge", "buckets/" + name))) .build() .register(); } @@ -117,7 +117,7 @@ public class TFMGFluids { .tag(TFMGTags.TFMGFluidTags.FUEL.tag, TFMGTags.TFMGFluidTags.FLAMMABLE.tag) .source(ForgeFlowingFluid.Source::new) .bucket() - .tag(AllTags.forgeItemTag("buckets/" + name)) + .tag(ItemTags.create(ResourceLocation.fromNamespaceAndPath("forge", "buckets/" + name))) .build() .register(); } @@ -136,7 +136,7 @@ public class TFMGFluids { .tag(tags) .source(ForgeFlowingFluid.Source::new) .bucket() - .tag(AllTags.forgeItemTag("buckets/" + name)) + .tag(ItemTags.create(ResourceLocation.fromNamespaceAndPath("forge", "buckets/" + name))) .build() .register(); } @@ -155,7 +155,7 @@ public class TFMGFluids { .tag(tags) .source(factory) .bucket() - .tag(AllTags.forgeItemTag("buckets/" + name)) + .tag(ItemTags.create(ResourceLocation.fromNamespaceAndPath("forge", "buckets/" + name))) .build() .register(); } @@ -169,7 +169,7 @@ public class TFMGFluids { .tag(TFMGTags.TFMGFluidTags.GAS.tag) .bucket() .lang(TFMGUtils.fromId(name) + " Tank") - .tag(AllTags.forgeItemTag("buckets/" + name)) + .tag(ItemTags.create(ResourceLocation.fromNamespaceAndPath("forge", "buckets/" + name))) .build() .register(); } @@ -184,7 +184,7 @@ public class TFMGFluids { .tag(TFMGTags.TFMGFluidTags.FLAMMABLE.tag) .bucket() .lang(TFMGUtils.fromId(name) + " Tank") - .tag(AllTags.forgeItemTag("buckets/" + name)) + .tag(ItemTags.create(ResourceLocation.fromNamespaceAndPath("forge", "buckets/" + name))) .build() .register(); } diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGGuiTextures.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGGuiTextures.java index 03c23465..71ab69f3 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGGuiTextures.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGGuiTextures.java @@ -57,7 +57,7 @@ public enum TFMGGuiTextures implements ScreenElement { } private TFMGGuiTextures(String namespace, String location, int startX, int startY, int width, int height) { - this.location = new ResourceLocation(namespace, "textures/gui/" + location + ".png"); + this.location = ResourceLocation.fromNamespaceAndPath(namespace, "textures/gui/" + location + ".png"); this.width = width; this.height = height; this.startX = startX; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java index ad00a16d..8ea3cd5a 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGItems.java @@ -5,7 +5,6 @@ import com.drmangotea.tfmg.base.TFMGArmorMaterials; import com.drmangotea.tfmg.base.TFMGTiers; import com.drmangotea.tfmg.content.decoration.gearbox.SteelVerticalGearboxItem; import com.drmangotea.tfmg.content.electricity.configuration_wrench.ElectriciansWrenchItem; -import com.drmangotea.tfmg.content.electricity.connection.cable_type.CableTypeEntry; import com.drmangotea.tfmg.content.electricity.debug.DebugCinderBlockItem; import com.drmangotea.tfmg.content.electricity.measurement.MultimeterItem; import com.drmangotea.tfmg.content.electricity.utilities.polarizer.MagnetItem; @@ -30,10 +29,11 @@ import com.drmangotea.tfmg.content.items.weapons.quad_potato_cannon.QuadPotatoCa import com.drmangotea.tfmg.content.machinery.misc.winding_machine.SpoolItem; import com.drmangotea.tfmg.content.machinery.oil_processing.OilHammerItem; import com.drmangotea.tfmg.content.machinery.oil_processing.pumpjack.pumpjack.base.DepositItem; -import com.simibubi.create.AllTags; import com.simibubi.create.content.processing.sequenced.SequencedAssemblyItem; import com.simibubi.create.foundation.data.AssetLookup; import com.simibubi.create.foundation.data.CreateRegistrate; +import com.drmangotea.tfmg.registry.TFMGTags.TFMGItemTags; +import com.simibubi.create.foundation.data.recipe.CommonMetal; import com.tterrag.registrate.builders.ItemBuilder; import com.tterrag.registrate.util.DataIngredient; import com.tterrag.registrate.util.entry.ItemEntry; @@ -41,7 +41,16 @@ import com.tterrag.registrate.util.entry.RegistryEntry; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; -import net.minecraft.world.item.*; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.ArmorMaterial; +import net.minecraft.world.item.AxeItem; +import net.minecraft.world.item.HoeItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.PickaxeItem; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.ShovelItem; +import net.minecraft.world.item.SwordItem; +import net.minecraft.world.item.Tier; import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.Tags; @@ -52,9 +61,12 @@ import java.util.Map; import static com.drmangotea.tfmg.TFMG.REGISTRATE; import static com.drmangotea.tfmg.base.TFMGBuilderTransformers.COLORS; -import static com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.ThermiteGrenade.ChemicalColor.*; +import static com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.ThermiteGrenade.ChemicalColor.BASE; +import static com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.ThermiteGrenade.ChemicalColor.BLUE; +import static com.drmangotea.tfmg.content.items.weapons.explosives.thermite_grenades.ThermiteGrenade.ChemicalColor.GREEN; import static com.simibubi.create.AllTags.AllItemTags.CREATE_INGOTS; -import static com.simibubi.create.AllTags.forgeItemTag; +import static com.simibubi.create.AllTags.AllItemTags.PLATES; +import static com.simibubi.create.AllTags.AllItemTags; public class TFMGItems { @@ -63,54 +75,55 @@ public class TFMGItems { public static final ItemEntry - STEEL_INGOT = taggedIngredient("steel_ingot", forgeItemTag("ingots/steel"), CREATE_INGOTS.tag), - CAST_IRON_INGOT = taggedIngredient("cast_iron_ingot", forgeItemTag("ingots/cast_iron"), CREATE_INGOTS.tag), - ALUMINUM_INGOT = taggedIngredient("aluminum_ingot", forgeItemTag("ingots/aluminum"), CREATE_INGOTS.tag), - PLASTIC_SHEET = taggedIngredient("plastic_sheet", forgeItemTag("ingots/plastic"), CREATE_INGOTS.tag), - HEAVY_PLATE = taggedIngredient("heavy_plate", forgeItemTag("plates/steel"), forgeItemTag("plates")), - ALUMINUM_SHEET = taggedIngredient("aluminum_sheet", forgeItemTag("plates/aluminum"), forgeItemTag("plates")), - NICKEL_SHEET = taggedIngredient("nickel_sheet", forgeItemTag("plates/nickel"), forgeItemTag("plates")), - CAST_IRON_SHEET = taggedIngredient("cast_iron_sheet", forgeItemTag("plates/cast_iron"), forgeItemTag("plates")), - LEAD_SHEET = taggedIngredient("lead_sheet", forgeItemTag("plates/lead"), forgeItemTag("plates")), - LEAD_INGOT = taggedIngredient("lead_ingot", forgeItemTag("ingots/lead"), CREATE_INGOTS.tag), - NICKEL_INGOT = taggedIngredient("nickel_ingot", forgeItemTag("ingots/nickel"), CREATE_INGOTS.tag), - CONSTANTAN_INGOT = taggedIngredient("constantan_ingot", forgeItemTag("ingots/constantan"), CREATE_INGOTS.tag), - LITHIUM_INGOT = taggedIngredient("lithium_ingot", forgeItemTag("ingots/lithium"), CREATE_INGOTS.tag), - ALUMINUM_NUGGET = taggedIngredient("aluminum_nugget", forgeItemTag("nuggets/aluminum"), forgeItemTag("nuggets")), - STEEL_NUGGET = taggedIngredient("steel_nugget", forgeItemTag("nuggets/steel"), forgeItemTag("nuggets")), - CAST_IRON_NUGGET = taggedIngredient("cast_iron_nugget", forgeItemTag("nuggets/cast_iron"), forgeItemTag("nuggets")), - CONSTANTAN_NUGGET = taggedIngredient("constantan_nugget", forgeItemTag("nuggets/constantan"), forgeItemTag("nuggets")), - LEAD_NUGGET = taggedIngredient("lead_nugget", forgeItemTag("nuggets/lead"), forgeItemTag("nuggets")), - NICKEL_NUGGET = taggedIngredient("nickel_nugget", forgeItemTag("nuggets/nickel"), forgeItemTag("nuggets")), - LITHIUM_NUGGET = taggedIngredient("lithium_nugget", forgeItemTag("nuggets/lithium"), forgeItemTag("nuggets")), - RAW_LEAD = taggedIngredient("raw_lead", forgeItemTag("raw_materials/lead"), forgeItemTag("raw_materials")), - RAW_NICKEL = taggedIngredient("raw_nickel", forgeItemTag("raw_materials/nickel"), forgeItemTag("raw_materials")), - RAW_LITHIUM = taggedIngredient("raw_lithium", forgeItemTag("raw_materials/lithium"), forgeItemTag("raw_materials")), - SYNTHETIC_LEATHER = taggedIngredient("synthetic_leather", Tags.Items.LEATHER, AllTags.forgeItemTag("leather")), - LIMESAND = taggedIngredient("limesand", TFMGTags.TFMGItemTags.FLUX.tag), - SULFUR_DUST = taggedIngredient("sulfur_dust", forgeItemTag("dusts/sulfur"), forgeItemTag("dusts")), - RUBBER_SHEET = taggedIngredient("rubber_sheet", forgeItemTag("ingots/rubber"), forgeItemTag("ingots")), - SILICON_INGOT = taggedIngredient("silicon_ingot", forgeItemTag("ingots/silicon"), forgeItemTag("ingots")), - CRUSHED_LITHIUM = taggedIngredient("crushed_raw_lithium", AllTags.AllItemTags.CRUSHED_RAW_MATERIALS.tag) + STEEL_INGOT = taggedIngredient("steel_ingot", CommonMetal.STEEL.ingots, Tags.Items.INGOTS, CREATE_INGOTS.tag), + CAST_IRON_INGOT = taggedIngredient("cast_iron_ingot", TFMGItemTags.INGOTS_CAST_IRON.tag, Tags.Items.INGOTS, CREATE_INGOTS.tag), + ALUMINUM_INGOT = taggedIngredient("aluminum_ingot", CommonMetal.ALUMINUM.ingots, Tags.Items.INGOTS, CREATE_INGOTS.tag), + PLASTIC_SHEET = taggedIngredient("plastic_sheet", TFMGItemTags.INGOTS_PLASTIC.tag, Tags.Items.INGOTS, CREATE_INGOTS.tag), + HEAVY_PLATE = taggedIngredient("heavy_plate", CommonMetal.STEEL.plates, PLATES.tag), + ALUMINUM_SHEET = taggedIngredient("aluminum_sheet", CommonMetal.ALUMINUM.plates, PLATES.tag), + NICKEL_SHEET = taggedIngredient("nickel_sheet", CommonMetal.NICKEL.plates, PLATES.tag), + CAST_IRON_SHEET = taggedIngredient("cast_iron_sheet", TFMGItemTags.PLATES_CAST_IRON.tag, PLATES.tag), + LEAD_SHEET = taggedIngredient("lead_sheet", CommonMetal.LEAD.plates, PLATES.tag), + LEAD_INGOT = taggedIngredient("lead_ingot", CommonMetal.LEAD.ingots, Tags.Items.INGOTS, CREATE_INGOTS.tag), + NICKEL_INGOT = taggedIngredient("nickel_ingot", CommonMetal.NICKEL.ingots, Tags.Items.INGOTS, CREATE_INGOTS.tag), + CONSTANTAN_INGOT = taggedIngredient("constantan_ingot", CommonMetal.CONSTANTAN.ingots, Tags.Items.INGOTS, CREATE_INGOTS.tag), + LITHIUM_INGOT = taggedIngredient("lithium_ingot", TFMGItemTags.INGOTS_LITHIUM.tag, Tags.Items.INGOTS, CREATE_INGOTS.tag), + ALUMINUM_NUGGET = taggedIngredient("aluminum_nugget", CommonMetal.ALUMINUM.nuggets, Tags.Items.NUGGETS), + STEEL_NUGGET = taggedIngredient("steel_nugget", CommonMetal.STEEL.nuggets, Tags.Items.NUGGETS), + CAST_IRON_NUGGET = taggedIngredient("cast_iron_nugget", TFMGItemTags.NUGGETS_CAST_IRON.tag, Tags.Items.NUGGETS), + CONSTANTAN_NUGGET = taggedIngredient("constantan_nugget", CommonMetal.CONSTANTAN.nuggets, Tags.Items.NUGGETS), + LEAD_NUGGET = taggedIngredient("lead_nugget", CommonMetal.LEAD.nuggets, Tags.Items.NUGGETS), + NICKEL_NUGGET = taggedIngredient("nickel_nugget", CommonMetal.NICKEL.nuggets, Tags.Items.NUGGETS), + LITHIUM_NUGGET = taggedIngredient("lithium_nugget", TFMGItemTags.NUGGETS_LITHIUM.tag, Tags.Items.NUGGETS), + RAW_LEAD = taggedIngredient("raw_lead", CommonMetal.LEAD.rawOres, Tags.Items.RAW_MATERIALS), + RAW_NICKEL = taggedIngredient("raw_nickel", CommonMetal.NICKEL.rawOres, Tags.Items.RAW_MATERIALS), + RAW_LITHIUM = taggedIngredient("raw_lithium", TFMGItemTags.RAW_LITHIUM.tag, Tags.Items.RAW_MATERIALS), + SYNTHETIC_LEATHER = taggedIngredient("synthetic_leather", Tags.Items.LEATHER), + LIMESAND = taggedIngredient("limesand", TFMGItemTags.FLUX.tag), + SULFUR_DUST = taggedIngredient("sulfur_dust", TFMGItemTags.DUSTS_SULFUR.tag, Tags.Items.DUSTS), + RUBBER_SHEET = taggedIngredient("rubber_sheet", TFMGItemTags.INGOTS_RUBBER.tag, PLATES.tag), + SILICON_INGOT = taggedIngredient("silicon_ingot", TFMGItemTags.INGOTS_SILICON.tag, CREATE_INGOTS.tag), + CRUSHED_LITHIUM = taggedIngredient("crushed_raw_lithium", AllItemTags.CRUSHED_RAW_MATERIALS.tag) ; public static final ItemEntry REBAR = REGISTRATE.item("rebar", Item::new) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("ingots/steel")), RecipeCategory.BUILDING_BLOCKS, c::get, 4)) + .tag(TFMGItemTags.RODS_STEEL.tag, Tags.Items.RODS) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.STEEL.ingots), RecipeCategory.BUILDING_BLOCKS, c, 4)) .register(), SYNTHETIC_STRING = REGISTRATE.item("synthetic_string", Item::new) - .tag(Tags.Items.STRING, AllTags.forgeItemTag("string")) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("ingots/rubber")), RecipeCategory.MISC, c::get, 4)) + .tag(Tags.Items.STRING) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(TFMGItemTags.INGOTS_RUBBER.tag), RecipeCategory.MISC, c, 4)) .register(); public static final ItemEntry - COPPER_WIRE = REGISTRATE.item("copper_wire", Item::new).tag(AllTags.forgeItemTag("wires/copper"), forgeItemTag("wires")) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("ingots/copper")), RecipeCategory.BUILDING_BLOCKS, c::get, 2)).register(), - ALUMINUM_WIRE = REGISTRATE.item("aluminum_wire", Item::new).tag(AllTags.forgeItemTag("wires/aluminum"), forgeItemTag("wires")) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("ingots/aluminum")), RecipeCategory.BUILDING_BLOCKS, c::get, 2)).register(), - CONSTANTAN_WIRE = REGISTRATE.item("constantan_wire", Item::new).tag(AllTags.forgeItemTag("wires/constantan"), forgeItemTag("wires")) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("ingots/constantan")), RecipeCategory.BUILDING_BLOCKS, c::get, 2)).register(); + COPPER_WIRE = REGISTRATE.item("copper_wire", Item::new).tag(TFMGItemTags.WIRES_COPPER.tag, TFMGItemTags.WIRES.tag) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.COPPER.ingots), RecipeCategory.BUILDING_BLOCKS, c, 2)).register(), + ALUMINUM_WIRE = REGISTRATE.item("aluminum_wire", Item::new).tag(TFMGItemTags.WIRES_ALUMINUM.tag, TFMGItemTags.WIRES.tag) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.ALUMINUM.ingots), RecipeCategory.BUILDING_BLOCKS, c, 2)).register(), + CONSTANTAN_WIRE = REGISTRATE.item("constantan_wire", Item::new).tag(TFMGItemTags.WIRES_CONSTANTAN.tag, TFMGItemTags.WIRES.tag) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.CONSTANTAN.ingots), RecipeCategory.BUILDING_BLOCKS, c, 2)).register(); public static final ItemEntry SPARK_PLUG = REGISTRATE.item("spark_plug", Item::new).register(), @@ -119,7 +132,7 @@ public class TFMGItems { FIREPROOF_BRICK = REGISTRATE.item("fireproof_brick", Item::new).register(), FIRECLAY_BALL = REGISTRATE.item("fireclay_ball", Item::new).register(), SCREW = REGISTRATE.item("screw", Item::new) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("ingots/steel")), RecipeCategory.BUILDING_BLOCKS, c::get, 4)) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.STEEL.ingots), RecipeCategory.BUILDING_BLOCKS, c, 4)) .lang("Screws") .register(), THERMITE_POWDER = REGISTRATE.item("thermite_powder", Item::new).register(), @@ -141,7 +154,7 @@ public class TFMGItems { TURBO = REGISTRATE.item("turbo", Item::new).register(), GOLDEN_TURBO = REGISTRATE.item("golden_turbo", Item::new).register(), CINDERBLOCK = REGISTRATE.item("cinderblock", Item::new) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(TFMGBlocks.CONCRETE.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 8)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(TFMGBlocks.CONCRETE.block.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 8)) .register(), CINDERFLOURBLOCK = REGISTRATE.item("cinderflourblock", Item::new).register(), NAPALM_POTATO = REGISTRATE.item("napalm_potato", Item::new).register(), @@ -161,19 +174,19 @@ public class TFMGItems { UNFINISHED_ELECTROMAGNETIC_COIL = REGISTRATE.item("unfinished_electromagnetic_coil", Item::new).register(), COPPER_ELECTRODE = REGISTRATE.item("copper_electrode", Item::new) .properties(p -> p.stacksTo(1)) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("storage_blocks/copper")), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.COPPER.storageBlocks.items()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .model((c, p) -> p.withExistingParent(c.getName(), TFMG.asResource("item/copper_electrode_model"))).register(), ZINC_ELECTRODE = REGISTRATE.item("zinc_electrode", Item::new) .properties(p -> p.stacksTo(1)) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("storage_blocks/zinc")), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(CommonMetal.ZINC.storageBlocks.items()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .model((c, p) -> p.withExistingParent(c.getName(), TFMG.asResource("item/zinc_electrode_model"))).register(), GRAPHITE_ELECTRODE = REGISTRATE.item("graphite_electrode", Item::new) .properties(p -> p.stacksTo(1)) - .recipe((c, p) -> p.stonecutting(DataIngredient.tag(AllTags.forgeItemTag("storage_blocks/coal_coke")), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.tag(TFMGItemTags.STORAGE_BLOCKS_COAL_COKE.tag), RecipeCategory.BUILDING_BLOCKS, c, 1)) .model((c, p) -> p.withExistingParent(c.getName(), TFMG.asResource("item/graphite_electrode_model"))).register(), UNFIRED_INSULATOR = REGISTRATE.item("unfired_insulator", Item::new) .model((c, p) -> p.withExistingParent(c.getName(), TFMG.asResource("item/unfired_insulator_model"))) - .recipe((c, p) -> p.stonecutting(DataIngredient.items(Blocks.CLAY.asItem()), RecipeCategory.BUILDING_BLOCKS, c::get, 1)) + .recipe((c, p) -> p.stonecutting(DataIngredient.items(Blocks.CLAY.asItem()), RecipeCategory.BUILDING_BLOCKS, c, 1)) .register(), UNFINISHED_INSULATOR = REGISTRATE.item("unfinished_insulator", Item::new) .model((c, p) -> p.withExistingParent(c.getName(), TFMG.asResource("item/unfinished_insulator_model"))).register(), @@ -212,7 +225,7 @@ public class TFMGItems { // .properties(p -> p.stacksTo(1)) // .register(); public static final ItemEntry COAL_COKE_DUST = REGISTRATE.item("coal_coke_dust", CoalCokeItem::new) - .tag(forgeItemTag("dusts/coal_coke"), TFMGTags.TFMGItemTags.BLAST_FURNACE_FUEL.tag, forgeItemTag("dusts")) + .tag(TFMGItemTags.DUSTS_COAL_COKE.tag, TFMGTags.TFMGItemTags.BLAST_FURNACE_FUEL.tag, Tags.Items.DUSTS) .register(); public static final ItemEntry OIL_HAMMER = REGISTRATE.item("oil_hammer", OilHammerItem::new) @@ -446,7 +459,7 @@ public class TFMGItems { public static ItemBuilder spoolItem(String name, int barColor, ResourceLocation type) { return REGISTRATE.item(name + "_spool", p -> new SpoolItem(p, barColor, type)) - .tag(TFMGTags.TFMGItemTags.SPOOLS.tag) + .tag(TFMGItemTags.SPOOLS.tag) .properties(p -> p.stacksTo(1)); } diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGMenuTypes.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGMenuTypes.java index 577fc230..84feb523 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGMenuTypes.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGMenuTypes.java @@ -3,7 +3,6 @@ package com.drmangotea.tfmg.registry; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerMenu; import com.drmangotea.tfmg.content.engines.engine_controller.EngineControllerScreen; -import com.simibubi.create.Create; import com.tterrag.registrate.builders.MenuBuilder.ForgeMenuFactory; import com.tterrag.registrate.builders.MenuBuilder.ScreenFactory; import com.tterrag.registrate.util.entry.MenuEntry; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGPackets.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGPackets.java index d960e2a6..5481c217 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGPackets.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGPackets.java @@ -6,10 +6,14 @@ import com.drmangotea.tfmg.content.electricity.base.ConnectNeightborsPacket; import com.drmangotea.tfmg.content.electricity.base.ElectricPlacementPacket; import com.drmangotea.tfmg.content.electricity.base.NetworkUpdatePacket; import com.drmangotea.tfmg.content.electricity.base.UpdateInFrontPacket; -import com.drmangotea.tfmg.content.electricity.connection.cables.CablePlacePacket; import com.drmangotea.tfmg.content.electricity.configuration_wrench.ElectriciansWrenchPacket; +import com.drmangotea.tfmg.content.electricity.connection.cables.CablePlacePacket; import com.drmangotea.tfmg.content.engines.engine_controller.TransmissionRemovePacket; -import com.drmangotea.tfmg.content.engines.engine_controller.packets.*; +import com.drmangotea.tfmg.content.engines.engine_controller.packets.EngineControllerBindPacket; +import com.drmangotea.tfmg.content.engines.engine_controller.packets.EngineControllerInputPacket; +import com.drmangotea.tfmg.content.engines.engine_controller.packets.EngineControllerStopControllerPacket; +import com.drmangotea.tfmg.content.engines.engine_controller.packets.EngineStartPacket; +import com.drmangotea.tfmg.content.engines.engine_controller.packets.TransmissionShiftPacket; import com.drmangotea.tfmg.content.items.weapons.advanced_potato_cannon.AdvancedPotatoCannonPacket; import com.drmangotea.tfmg.content.items.weapons.quad_potato_cannon.QuadPotatoCannonPacket; import com.drmangotea.tfmg.content.machinery.metallurgy.coke_oven.CokeOvenPacket; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteStoneTypes.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteStoneTypes.java index 194d0692..0c36ce56 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteStoneTypes.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteStoneTypes.java @@ -1,15 +1,15 @@ package com.drmangotea.tfmg.registry; - import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.palettes.TFMGPaletteBlockPattern; import com.drmangotea.tfmg.base.palettes.TFMGPalettesVariantEntry; import com.simibubi.create.AllTags; import com.simibubi.create.foundation.data.CreateRegistrate; - import com.simibubi.create.foundation.utility.CreateLang; import com.tterrag.registrate.util.nullness.NonNullSupplier; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; @@ -60,8 +60,8 @@ public enum TFMGPaletteStoneTypes { NonNullSupplier baseBlock = paletteStoneVariants.factory.apply(registrate); paletteStoneVariants.baseBlock = baseBlock; String id = CreateLang.asId(paletteStoneVariants.name()); - paletteStoneVariants.materialTag = - AllTags.optionalTag(ForgeRegistries.ITEMS, TFMG.asResource("stone_types/" + id)); + paletteStoneVariants.materialTag = + ItemTags.create(ResourceLocation.fromNamespaceAndPath("forge", "stone_types/" + id.replace("forge:", ""))); paletteStoneVariants.variants = new TFMGPalettesVariantEntry(id, paletteStoneVariants); } } diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGPartialModels.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGPartialModels.java index efc7a3b3..b5059c26 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGPartialModels.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGPartialModels.java @@ -4,7 +4,6 @@ package com.drmangotea.tfmg.registry; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.content.decoration.pipes.TFMGPipes; import com.simibubi.create.content.fluids.FluidTransportBehaviour; - import com.simibubi.create.foundation.utility.CreateLang; import dev.engine_room.flywheel.lib.model.baked.PartialModel; import net.createmod.catnip.data.Couple; @@ -12,7 +11,11 @@ import net.createmod.catnip.data.Iterate; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class TFMGPartialModels { diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGParticleTypes.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGParticleTypes.java index 78ca63f8..d7c41671 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGParticleTypes.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGParticleTypes.java @@ -4,7 +4,6 @@ package com.drmangotea.tfmg.registry; import com.drmangotea.tfmg.TFMG; import com.drmangotea.tfmg.base.spark.ElectricSparkParticle; import com.simibubi.create.foundation.particle.ICustomParticleData; - import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleType; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGRecipeTypes.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGRecipeTypes.java index 8456cc0b..08d64972 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGRecipeTypes.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGRecipeTypes.java @@ -2,18 +2,26 @@ package com.drmangotea.tfmg.registry; import com.drmangotea.tfmg.TFMG; -import com.drmangotea.tfmg.recipes.*; +import com.drmangotea.tfmg.recipes.CastingRecipe; +import com.drmangotea.tfmg.recipes.CokingRecipe; +import com.drmangotea.tfmg.recipes.DistillationRecipe; +import com.drmangotea.tfmg.recipes.HotBlastRecipe; +import com.drmangotea.tfmg.recipes.IndustrialBlastingRecipe; +import com.drmangotea.tfmg.recipes.PolarizingRecipe; +import com.drmangotea.tfmg.recipes.VatMachineRecipe; +import com.drmangotea.tfmg.recipes.WindingRecipe; import com.simibubi.create.AllTags; -import com.simibubi.create.content.equipment.toolbox.ToolboxDyeingRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder.ProcessingRecipeFactory; import com.simibubi.create.content.processing.recipe.ProcessingRecipeSerializer; import com.simibubi.create.foundation.recipe.IRecipeTypeInfo; - import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.Container; -import net.minecraft.world.item.crafting.*; +import net.minecraft.world.item.crafting.Recipe; +import net.minecraft.world.item.crafting.RecipeSerializer; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.item.crafting.ShapedRecipe; import net.minecraft.world.level.Level; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.registries.DeferredRegister; diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGSoundEvents.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGSoundEvents.java index 26ba73a3..3491ec2b 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGSoundEvents.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGSoundEvents.java @@ -1,14 +1,9 @@ package com.drmangotea.tfmg.registry; import com.drmangotea.tfmg.TFMG; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import com.simibubi.create.AllSoundEvents; -import com.simibubi.create.Create; import net.minecraft.core.Holder; -import net.minecraft.core.Registry; import net.minecraft.core.Vec3i; import net.minecraft.core.registries.Registries; import net.minecraft.data.CachedOutput; @@ -27,7 +22,6 @@ import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegisterEvent; import net.minecraftforge.registries.RegistryObject; -import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; import java.util.HashMap; @@ -344,7 +338,7 @@ public class TFMGSoundEvents { } protected ResourceLocation getIdOf(int i) { - return new ResourceLocation(id.getNamespace(), i == 0 ? id.getPath() : id.getPath() + "_compounded_" + i); + return ResourceLocation.fromNamespaceAndPath(id.getNamespace(), i == 0 ? id.getPath() : id.getPath() + "_compounded_" + i); } @Override diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGTags.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGTags.java index 91ed34ba..4e8b4940 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGTags.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGTags.java @@ -2,21 +2,15 @@ package com.drmangotea.tfmg.registry; import com.drmangotea.tfmg.TFMG; -import com.simibubi.create.AllTags; - import com.simibubi.create.foundation.utility.CreateLang; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.FluidTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; -import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.level.material.FluidState; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.IForgeRegistry; @@ -35,7 +29,7 @@ public class TFMGTags { } public static TagKey forgeTag(IForgeRegistry registry, String path) { - return optionalTag(registry, new ResourceLocation("forge", path)); + return optionalTag(registry, ResourceLocation.fromNamespaceAndPath("forge", path)); } public static TagKey forgeBlockTag(String path) { @@ -51,139 +45,100 @@ public class TFMGTags { } public enum NameSpace { - - MOD(TFMG.MOD_ID, false, true), + MOD(TFMG.MOD_ID), FORGE("forge") - - ; public final String id; - public final boolean optionalDefault; - public final boolean alwaysDatagenDefault; NameSpace(String id) { - this(id, true, false); - } - - NameSpace(String id, boolean optionalDefault, boolean alwaysDatagenDefault) { this.id = id; - this.optionalDefault = optionalDefault; - this.alwaysDatagenDefault = alwaysDatagenDefault; } } public enum TFMGBlockTags { - BLAST_FURNACE_WALL, - REINFORCED_BLAST_FURNACE_WALL, - BLAST_FURNACE_SUPPORT, - INDUSTRIAL_PIPE, - REINFORCED_BLAST_FURNACE_SUPPORT, - SURFACE_SCANNER_FINDABLE, - PUMPJACK_PART, - PUMPJACK_HEAD, - PUMPJACK_CONNECTOR, - PUMPJACK_SMALL_PART + BLAST_FURNACE_SUPPORT, + BLAST_FURNACE_WALL, + INDUSTRIAL_PIPE, + ORES_LITHIUM(FORGE, "ores/lithium"), + PUMPJACK_CONNECTOR, + PUMPJACK_HEAD, + PUMPJACK_PART, + PUMPJACK_SMALL_PART, + RAW_LITHIUM(FORGE, "raw_materials/lithium"), + REINFORCED_BLAST_FURNACE_SUPPORT, + REINFORCED_BLAST_FURNACE_WALL, + STORAGE_BLOCKS_CAST_IRON(FORGE, "storage_blocks/cast_iron"), + STORAGE_BLOCKS_COAL_COKE(FORGE, "storage_blocks/coal_coke"), + STORAGE_BLOCKS_LITHIUM(FORGE, "storage_blocks/lithium"), + STORAGE_BLOCKS_PLASTIC(FORGE, "storage_blocks/plastic"), + STORAGE_BLOCKS_RAW_LITHIUM(FORGE, "storage_blocks/raw_lithium"), + SURFACE_SCANNER_FINDABLE, + CONCRETE(FORGE, "concrete") ; public final TagKey tag; - public final boolean alwaysDatagen; TFMGBlockTags() { this(MOD); } TFMGBlockTags(NameSpace namespace) { - this(namespace, namespace.optionalDefault, namespace.alwaysDatagenDefault); + this(namespace, null); } TFMGBlockTags(NameSpace namespace, String path) { - this(namespace, path, namespace.optionalDefault, namespace.alwaysDatagenDefault); + ResourceLocation id = ResourceLocation.fromNamespaceAndPath(namespace.id, path == null ? CreateLang.asId(name()) : path); + this.tag = BlockTags.create(id); } - TFMGBlockTags(NameSpace namespace, boolean optional, boolean alwaysDatagen) { - this(namespace, null, optional, alwaysDatagen); - } - - TFMGBlockTags(NameSpace namespace, String path, boolean optional, boolean alwaysDatagen) { - ResourceLocation id = new ResourceLocation(namespace.id, path == null ? CreateLang.asId(name()) : path); - if (optional) { - tag = optionalTag(ForgeRegistries.BLOCKS, id); - } else { - tag = BlockTags.create(id); - } - this.alwaysDatagen = alwaysDatagen; - } - - @SuppressWarnings("deprecation") - public boolean matches(Block block) { - return block.builtInRegistryHolder() - .is(tag); - } - - public boolean matches(ItemStack stack) { - return stack != null && stack.getItem() instanceof BlockItem blockItem && matches(blockItem.getBlock()); - } - - public boolean matches(BlockState state) { - return state.is(tag); - } - - private static void init() {} - } public enum TFMGItemTags { - - FLUX, - SPOOLS, - BLAST_FURNACE_FUEL, - RODS, - IRON_PLATES(FORGE, "plates/iron"), - ALUMINUM_PLATES(FORGE, "plates/aluminum") - + BLAST_FURNACE_FUEL, + DUSTS_COAL_COKE(FORGE, "dusts/coal_coke"), + DUSTS_IRON(FORGE, "dusts/iron"), + DUSTS_SALTPETER(FORGE, "dusts/saltpeter"), + DUSTS_SULFUR(FORGE, "dusts/sulfur"), + FLUX, + INGOTS_CAST_IRON(FORGE, "ingots/cast_iron"), + INGOTS_LITHIUM(FORGE, "ingots/lithium"), + INGOTS_PLASTIC(FORGE, "ingots/plastic"), + INGOTS_RUBBER(FORGE, "ingots/rubber"), + INGOTS_SILICON(FORGE, "ingots/silicon"), + NUGGETS_CAST_IRON(FORGE, "nuggets/cast_iron"), + NUGGETS_LITHIUM(FORGE, "nuggets/lithium"), + ORES_LITHIUM(FORGE, "ores/lithium"), + PLATES_CAST_IRON(FORGE, "plates/cast_iron"), + RAW_LITHIUM(FORGE, "raw_materials/lithium"), + RODS_STEEL(FORGE, "rods/steel"), + SPOOLS, + STORAGE_BLOCKS_CAST_IRON(FORGE, "storage_blocks/cast_iron"), + STORAGE_BLOCKS_COAL_COKE(FORGE, "storage_blocks/coal_coke"), + STORAGE_BLOCKS_LITHIUM(FORGE, "storage_blocks/lithium"), + STORAGE_BLOCKS_PLASTIC(FORGE, "storage_blocks/plastic"), + STORAGE_BLOCKS_RAW_LITHIUM(FORGE, "storage_blocks/raw_lithium"), + WIRES(FORGE), + WIRES_ALUMINUM(FORGE, "wires/aluminum"), + WIRES_CONSTANTAN(FORGE, "wires/constantan"), + WIRES_COPPER(FORGE, "wires/copper"), + CONCRETE(FORGE, "concrete") ; public final TagKey tag; - public final boolean alwaysDatagen; TFMGItemTags() { this(NameSpace.MOD); } TFMGItemTags(NameSpace namespace) { - this(namespace, namespace.optionalDefault, namespace.alwaysDatagenDefault); + this(namespace, null); } TFMGItemTags(NameSpace namespace, String path) { - this(namespace, path, namespace.optionalDefault, namespace.alwaysDatagenDefault); + ResourceLocation id = ResourceLocation.fromNamespaceAndPath(namespace.id, path == null ? CreateLang.asId(name()) : path); + this.tag = ItemTags.create(id); } - TFMGItemTags(NameSpace namespace, boolean optional, boolean alwaysDatagen) { - this(namespace, null, optional, alwaysDatagen); - } - - TFMGItemTags(NameSpace namespace, String path, boolean optional, boolean alwaysDatagen) { - ResourceLocation id = new ResourceLocation(namespace.id, path == null ? CreateLang.asId(name()) : path); - if (optional) { - tag = optionalTag(ForgeRegistries.ITEMS, id); - } else { - tag = ItemTags.create(id); - } - this.alwaysDatagen = alwaysDatagen; - } - - @SuppressWarnings("deprecation") - public boolean matches(Item item) { - return item.builtInRegistryHolder() - .is(tag); - } - - public boolean matches(ItemStack stack) { - return stack.is(tag); - } - - private static void init() {} - } public enum TFMGFluidTags { GAS(MOD), @@ -191,74 +146,40 @@ public class TFMGTags { FLAMMABLE(MOD), FIREBOX_FUEL(MOD), BLAST_STOVE_FUEL(MOD), - AIR(NameSpace.FORGE), - COOLING_FLUID(NameSpace.FORGE), + AIR(FORGE), + COOLING_FLUID(FORGE), - GASOLINE(NameSpace.FORGE), - DIESEL(NameSpace.FORGE), - KEROSENE(NameSpace.FORGE), + GASOLINE(FORGE), + DIESEL(FORGE), + KEROSENE(FORGE), - CREOSOTE(NameSpace.FORGE), - FURNACE_GAS(NameSpace.FORGE), - - LPG(NameSpace.FORGE), - HEAVY_OIL(NameSpace.FORGE), - LUBRICATION_OIL(NameSpace.FORGE), - NAPHTHA(NameSpace.FORGE), - CRUDE_OIL(NameSpace.FORGE), - MOLTEN_STEEL(NameSpace.FORGE), - FUEL(NameSpace.FORGE) + CREOSOTE(FORGE), + FURNACE_GAS(FORGE), + LPG(FORGE), + HEAVY_OIL(FORGE), + LUBRICATION_OIL(FORGE), + NAPHTHA(FORGE), + CRUDE_OIL(FORGE), + MOLTEN_STEEL(FORGE), + FUEL(FORGE) ; public final TagKey tag; - public final boolean alwaysDatagen; TFMGFluidTags() { this(MOD); } TFMGFluidTags(NameSpace namespace) { - this(namespace, namespace.optionalDefault, namespace.alwaysDatagenDefault); + this(namespace, null); } TFMGFluidTags(NameSpace namespace, String path) { - this(namespace, path, namespace.optionalDefault, namespace.alwaysDatagenDefault); + ResourceLocation id = ResourceLocation.fromNamespaceAndPath(namespace.id, path == null ? CreateLang.asId(name()) : path); + this.tag = FluidTags.create(id); } - TFMGFluidTags(NameSpace namespace, boolean optional, boolean alwaysDatagen) { - this(namespace, null, optional, alwaysDatagen); - } - - TFMGFluidTags(NameSpace namespace, String path, boolean optional, boolean alwaysDatagen) { - ResourceLocation id = new ResourceLocation(namespace.id, path == null ? CreateLang.asId(name()) : path); - if (optional) { - tag = optionalTag(ForgeRegistries.FLUIDS, id); - } else { - tag = FluidTags.create(id); - } - this.alwaysDatagen = alwaysDatagen; - } - - @SuppressWarnings("deprecation") - public boolean matches(Fluid fluid) { - return fluid.is(tag); - } - - public boolean matches(FluidState state) { - return state.is(tag); - } - - private static void init() {} - } - - public static void init() { - TFMGBlockTags.init(); - // TFMGItemTags.register(); - TFMGFluidTags.init(); - //TFMGEntityTags.register(); - //TFMGRecipeSerializerTags.register(); - } } diff --git a/src/main/java/com/drmangotea/tfmg/worldgen/TFMGBiomeModifiers.java b/src/main/java/com/drmangotea/tfmg/worldgen/TFMGBiomeModifiers.java index a409d07c..41e9ed5e 100644 --- a/src/main/java/com/drmangotea/tfmg/worldgen/TFMGBiomeModifiers.java +++ b/src/main/java/com/drmangotea/tfmg/worldgen/TFMGBiomeModifiers.java @@ -11,7 +11,6 @@ import net.minecraft.tags.BiomeTags; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.levelgen.GenerationStep; import net.minecraft.world.level.levelgen.placement.PlacedFeature; -import net.minecraftforge.common.Tags; import net.minecraftforge.common.world.BiomeModifier; import net.minecraftforge.common.world.ForgeBiomeModifiers; import net.minecraftforge.registries.ForgeRegistries; diff --git a/src/main/java/com/drmangotea/tfmg/worldgen/TFMGPlacedFeatures.java b/src/main/java/com/drmangotea/tfmg/worldgen/TFMGPlacedFeatures.java index 95d8d9e0..a522f87e 100644 --- a/src/main/java/com/drmangotea/tfmg/worldgen/TFMGPlacedFeatures.java +++ b/src/main/java/com/drmangotea/tfmg/worldgen/TFMGPlacedFeatures.java @@ -1,17 +1,20 @@ package com.drmangotea.tfmg.worldgen; import com.drmangotea.tfmg.TFMG; -import com.simibubi.create.infrastructure.worldgen.AllConfiguredFeatures; import com.simibubi.create.infrastructure.worldgen.ConfigPlacementFilter; import net.minecraft.core.Holder; import net.minecraft.core.HolderGetter; import net.minecraft.core.registries.Registries; import net.minecraft.data.worldgen.BootstapContext; import net.minecraft.resources.ResourceKey; -import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.levelgen.VerticalAnchor; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; -import net.minecraft.world.level.levelgen.placement.*; +import net.minecraft.world.level.levelgen.placement.CountPlacement; +import net.minecraft.world.level.levelgen.placement.HeightRangePlacement; +import net.minecraft.world.level.levelgen.placement.InSquarePlacement; +import net.minecraft.world.level.levelgen.placement.PlacedFeature; +import net.minecraft.world.level.levelgen.placement.PlacementModifier; +import net.minecraft.world.level.levelgen.placement.RarityFilter; import java.util.List; diff --git a/src/main/java/com/drmangotea/tfmg/worldgen/deposits/OilDepositFeature.java b/src/main/java/com/drmangotea/tfmg/worldgen/deposits/OilDepositFeature.java index 855686aa..4d91b9f3 100644 --- a/src/main/java/com/drmangotea/tfmg/worldgen/deposits/OilDepositFeature.java +++ b/src/main/java/com/drmangotea/tfmg/worldgen/deposits/OilDepositFeature.java @@ -7,9 +7,7 @@ import com.mojang.serialization.Codec; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.util.RandomSource; -import net.minecraft.world.level.Level; import net.minecraft.world.level.WorldGenLevel; -import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.levelgen.feature.Feature; import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;