diff --git a/docs/content/Modpacks/Changes/v8.0.0.md b/docs/content/Modpacks/Changes/v8.0.0.md index 9e9aae3f31a..74e7e28a656 100644 --- a/docs/content/Modpacks/Changes/v8.0.0.md +++ b/docs/content/Modpacks/Changes/v8.0.0.md @@ -140,7 +140,16 @@ A large number of machine feature interfaces have been removed, and have had the - `IHPCACoolantProvider` - Use `HPCACoolantProviderTrait` + ## Other Changes - `BlastingRecipeBuilder`, `CampfireRecipeBuilder`, `SmeltingRecipeBuilder` and `SmokingRecipeBuilder` have been merged into `SimpleCookingRecipeBuilder` - - Example usage: `SimpleCookingRecipeBuilder.campfireCooking("cooking_chicken").input(new ItemStack(Items.CHICKEN)).output(new ItemStacks(Items.COOKED_CHICKEN)).cookingTime(100).experience(100).save(provider);` \ No newline at end of file + - Example usage: `SimpleCookingRecipeBuilder.campfireCooking("cooking_chicken").input(new ItemStack(Items.CHICKEN)).output(new ItemStacks(Items.COOKED_CHICKEN)).cookingTime(100).experience(100).save(provider);` + +### File Structure Changes + +- Some item classes have been moved from `api/item` to `common/item` +- All item behaviors have been moved to `common/item/behavior` from `common/item` +- `GTFluidBuilder` is now located at `api/registry/registrate` instead of `api/registry/registrate/forge` +- `GTFluidImpl` has been merged into `GTFluid` +- `TagUtil` is now located at `utils/` instead of `api/data/tag` diff --git a/src/main/java/com/gregtechceu/gtceu/api/addon/IGTAddon.java b/src/main/java/com/gregtechceu/gtceu/api/addon/IGTAddon.java index 7aa4eb45714..d008c742937 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/addon/IGTAddon.java +++ b/src/main/java/com/gregtechceu/gtceu/api/addon/IGTAddon.java @@ -3,6 +3,7 @@ import com.gregtechceu.gtceu.api.addon.events.KJSRecipeKeyEvent; import com.gregtechceu.gtceu.api.addon.events.MaterialCasingCollectionEvent; import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; +import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; import com.gregtechceu.gtceu.common.data.GTOres; @@ -96,7 +97,7 @@ default void registerOreVeins() {} default void registerFluidVeins() {} /** - * Use {@link com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition#builder(ResourceLocation)} to + * Use {@link BedrockOreDefinition#builder(ResourceLocation)} to * register the veins. */ default void registerBedrockOreVeins() {} diff --git a/src/main/java/com/gregtechceu/gtceu/api/block/AppearanceBlock.java b/src/main/java/com/gregtechceu/gtceu/api/block/AppearanceBlock.java deleted file mode 100644 index a112471202c..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/block/AppearanceBlock.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.gregtechceu.gtceu.api.block; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.world.level.BlockAndTintGetter; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; - -import org.jetbrains.annotations.Nullable; - -/** - * @deprecated Use normal Block class instead - replace {@code AppearanceBlock::getBlockAppearance} with - * {@code Block::getAppearance} - */ -@Deprecated(forRemoval = true) -public class AppearanceBlock extends Block implements IAppearance { - - public AppearanceBlock(Properties properties) { - super(properties); - } - - @Override - public BlockState getAppearance(BlockState state, BlockAndTintGetter level, BlockPos pos, Direction side, - @Nullable BlockState queryState, @Nullable BlockPos queryPos) { - var appearance = this.getBlockAppearance(state, level, pos, side, queryState, queryPos); - return appearance == null ? state : appearance; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/block/IAppearance.java b/src/main/java/com/gregtechceu/gtceu/api/block/IAppearance.java deleted file mode 100644 index ac9d9a489ca..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/block/IAppearance.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.gregtechceu.gtceu.api.block; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.world.level.BlockAndTintGetter; -import net.minecraft.world.level.block.state.BlockState; - -import org.jetbrains.annotations.Nullable; - -@Deprecated(forRemoval = true) -public interface IAppearance { - - /** - * get Appearance. same as IForgeBlock.getAppearance() / IFabricBlock.getAppearance() - */ - @Nullable - default BlockState getBlockAppearance(BlockState state, BlockAndTintGetter level, BlockPos pos, Direction side, - BlockState sourceState, BlockPos sourcePos) { - return state; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java b/src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java index c16c3d6a2c3..8194d3c1072 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/api/block/PipeBlock.java @@ -18,7 +18,7 @@ import com.gregtechceu.gtceu.client.model.pipe.PipeModel; import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; -import com.gregtechceu.gtceu.common.item.CoverPlaceBehavior; +import com.gregtechceu.gtceu.common.item.behavior.CoverPlaceBehavior; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import com.gregtechceu.gtceu.utils.GTMath; diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/forge/GTCapability.java b/src/main/java/com/gregtechceu/gtceu/api/capability/GTCapability.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/api/capability/forge/GTCapability.java rename to src/main/java/com/gregtechceu/gtceu/api/capability/GTCapability.java index f26b143cd3f..66a0aa5c6b3 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/forge/GTCapability.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/GTCapability.java @@ -1,6 +1,5 @@ -package com.gregtechceu.gtceu.api.capability.forge; +package com.gregtechceu.gtceu.api.capability; -import com.gregtechceu.gtceu.api.capability.*; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/GTCapabilityHelper.java b/src/main/java/com/gregtechceu/gtceu/api/capability/GTCapabilityHelper.java index 1bf8262ac7e..ddd096e5fab 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/GTCapabilityHelper.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/GTCapabilityHelper.java @@ -1,6 +1,5 @@ package com.gregtechceu.gtceu.api.capability; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IMaintenanceMachine; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/compat/EUToFEProvider.java b/src/main/java/com/gregtechceu/gtceu/api/capability/compat/EUToFEProvider.java index 619d7904dec..b3b025c8f1a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/compat/EUToFEProvider.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/compat/EUToFEProvider.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.api.capability.compat; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.IEnergyContainer; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.GTMath; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/RecipeCapability.java b/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/RecipeCapability.java index 28df149687e..6d2a54badc1 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/RecipeCapability.java +++ b/src/main/java/com/gregtechceu/gtceu/api/capability/recipe/RecipeCapability.java @@ -1,6 +1,5 @@ package com.gregtechceu.gtceu.api.capability.recipe; -import com.gregtechceu.gtceu.api.codec.DispatchedMapCodec; import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.recipe.content.Content; @@ -9,6 +8,7 @@ import com.gregtechceu.gtceu.api.recipe.lookup.ingredient.AbstractMapIngredient; import com.gregtechceu.gtceu.api.recipe.ui.GTRecipeTypeUI; import com.gregtechceu.gtceu.api.registry.GTRegistries; +import com.gregtechceu.gtceu.utils.codec.DispatchedMapCodec; import com.lowdragmc.lowdraglib.gui.widget.Widget; import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java index 3cc568351df..beb1559b2b5 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java @@ -10,9 +10,9 @@ import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; -import com.gregtechceu.gtceu.api.data.tag.TagUtil; import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKey; import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.Holder; diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java index 063d6addcb3..3c1160997b3 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/Material.java @@ -10,7 +10,6 @@ import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; -import com.gregtechceu.gtceu.api.data.tag.TagUtil; import com.gregtechceu.gtceu.api.fluids.FluidBuilder; import com.gregtechceu.gtceu.api.fluids.FluidState; import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKey; @@ -22,6 +21,7 @@ import com.gregtechceu.gtceu.integration.kjs.helpers.MaterialStackWrapper; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTMath; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/HazardProperty.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/HazardProperty.java index 64ce68c8eba..6f3a184a71a 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/HazardProperty.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/material/properties/HazardProperty.java @@ -6,10 +6,10 @@ import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; -import com.gregtechceu.gtceu.api.item.GTBucketItem; import com.gregtechceu.gtceu.api.item.TagPrefixItem; import com.gregtechceu.gtceu.api.item.armor.ArmorComponentItem; import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.common.item.GTBucketItem; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.recipe.CustomTags; diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagType.java b/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagType.java index e0c01fe8ab0..41065043cd0 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagType.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagType.java @@ -1,6 +1,7 @@ package com.gregtechceu.gtceu.api.data.tag; import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluids/GTFluid.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/GTFluid.java index 05fbacab74c..1051f1e684c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluids/GTFluid.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/GTFluid.java @@ -6,6 +6,7 @@ import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.sounds.SoundEvent; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; import net.minecraft.world.level.BlockGetter; @@ -17,15 +18,19 @@ 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.StateDefinition; import net.minecraft.world.level.material.FlowingFluid; import net.minecraft.world.level.material.Fluid; import net.minecraft.world.level.material.Fluids; +import net.minecraftforge.common.SoundActions; +import net.minecraftforge.fluids.FluidType; import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet; import lombok.Getter; import org.jetbrains.annotations.NotNull; import java.util.Collection; +import java.util.Optional; import java.util.function.Supplier; import javax.annotation.ParametersAreNonnullByDefault; @@ -44,10 +49,11 @@ public abstract class GTFluid extends FlowingFluid implements IAttributedFluid { private final Supplier block; @Getter private final int burnTime; + private final Supplier fluidType; public GTFluid(@NotNull FluidState state, Supplier stillFluid, Supplier flowingFluid, Supplier block, - Supplier bucket, int burnTime) { + Supplier bucket, int burnTime, Supplier fluidType) { super(); this.state = state; this.stillFluid = stillFluid; @@ -55,6 +61,7 @@ public GTFluid(@NotNull FluidState state, Supplier stillFluid, this.block = block; this.bucketItem = bucket; this.burnTime = burnTime; + this.fluidType = fluidType; } @Override @@ -127,4 +134,58 @@ public boolean isSame(Fluid fluid) { boolean flowing = this.getFlowing() == fluid; return still || flowing; } + + @Override + public FluidType getFluidType() { + return fluidType.get(); + } + + @Override + public Optional getPickupSound() { + return fluidType != null && fluidType.get() != null ? + Optional.ofNullable(fluidType.get().getSound(SoundActions.BUCKET_FILL)) : Optional.empty(); + } + + public static class Source extends GTFluid { + + public Source(@NotNull FluidState state, Supplier stillFluid, + Supplier flowingFluid, Supplier block, + Supplier bucket, int burnTime, Supplier fluidType) { + super(state, stillFluid, flowingFluid, block, bucket, burnTime, fluidType); + } + + @Override + public int getAmount(net.minecraft.world.level.material.FluidState state) { + return 8; + } + + @Override + public boolean isSource(net.minecraft.world.level.material.FluidState state) { + return true; + } + } + + public static class Flowing extends GTFluid { + + public Flowing(@NotNull FluidState state, Supplier stillFluid, + Supplier flowingFluid, Supplier block, + Supplier bucket, int burnTime, Supplier fluidType) { + super(state, stillFluid, flowingFluid, block, bucket, burnTime, fluidType); + } + + protected void createFluidStateDefinition(StateDefinition.@NotNull Builder builder) { + super.createFluidStateDefinition(builder); + builder.add(LEVEL); + } + + @Override + public int getAmount(net.minecraft.world.level.material.FluidState state) { + return state.getValue(LEVEL); + } + + @Override + public boolean isSource(net.minecraft.world.level.material.FluidState state) { + return false; + } + } } diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluids/forge/GTFluidImpl.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/forge/GTFluidImpl.java deleted file mode 100644 index cbc6e009b09..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/fluids/forge/GTFluidImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.gregtechceu.gtceu.api.fluids.forge; - -import com.gregtechceu.gtceu.api.fluids.FluidState; -import com.gregtechceu.gtceu.api.fluids.GTFluid; - -import net.minecraft.MethodsReturnNonnullByDefault; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.world.item.Item; -import net.minecraft.world.level.block.LiquidBlock; -import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.material.Fluid; -import net.minecraftforge.common.SoundActions; -import net.minecraftforge.common.extensions.IForgeFluid; -import net.minecraftforge.fluids.FluidType; - -import org.jetbrains.annotations.NotNull; - -import java.util.Optional; -import java.util.function.Supplier; - -import javax.annotation.ParametersAreNonnullByDefault; - -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -public abstract class GTFluidImpl extends GTFluid implements IForgeFluid { - - private final Supplier fluidType; - - public GTFluidImpl(@NotNull FluidState state, Supplier stillFluid, - Supplier flowingFluid, Supplier block, - Supplier bucket, int burnTime, Supplier fluidType) { - super(state, stillFluid, flowingFluid, block, bucket, burnTime); - this.fluidType = fluidType; - } - - @Override - public FluidType getFluidType() { - return fluidType.get(); - } - - @Override - public Optional getPickupSound() { - return fluidType != null && fluidType.get() != null ? - Optional.ofNullable(fluidType.get().getSound(SoundActions.BUCKET_FILL)) : Optional.empty(); - } - - public static class Source extends GTFluidImpl { - - public Source(@NotNull FluidState state, Supplier stillFluid, - Supplier flowingFluid, Supplier block, - Supplier bucket, int burnTime, Supplier fluidType) { - super(state, stillFluid, flowingFluid, block, bucket, burnTime, fluidType); - } - - @Override - public int getAmount(net.minecraft.world.level.material.FluidState state) { - return 8; - } - - @Override - public boolean isSource(net.minecraft.world.level.material.FluidState state) { - return true; - } - } - - public static class Flowing extends GTFluidImpl { - - public Flowing(@NotNull FluidState state, Supplier stillFluid, - Supplier flowingFluid, Supplier block, - Supplier bucket, int burnTime, Supplier fluidType) { - super(state, stillFluid, flowingFluid, block, bucket, burnTime, fluidType); - // registerDefaultState(getStateDefinition().any().setValue(LEVEL, 7)); - } - - protected void createFluidStateDefinition(StateDefinition.@NotNull Builder builder) { - super.createFluidStateDefinition(builder); - builder.add(LEVEL); - } - - @Override - public int getAmount(net.minecraft.world.level.material.FluidState state) { - return state.getValue(LEVEL); - } - - @Override - public boolean isSource(net.minecraft.world.level.material.FluidState state) { - return false; - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageKey.java b/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageKey.java index 85f2225d91c..4d9bf429e87 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageKey.java +++ b/src/main/java/com/gregtechceu/gtceu/api/fluids/store/FluidStorageKey.java @@ -2,8 +2,8 @@ import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType; -import com.gregtechceu.gtceu.api.data.tag.TagUtil; import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; diff --git a/src/main/java/com/gregtechceu/gtceu/api/gui/misc/ProspectorMode.java b/src/main/java/com/gregtechceu/gtceu/api/gui/misc/ProspectorMode.java index 0a00d5a9c19..dd36054dc54 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/gui/misc/ProspectorMode.java +++ b/src/main/java/com/gregtechceu/gtceu/api/gui/misc/ProspectorMode.java @@ -5,7 +5,6 @@ import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; -import com.gregtechceu.gtceu.api.data.tag.TagUtil; import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidVeinSavedData; import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.FluidVeinWorldEntry; import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreVeinSavedData; @@ -14,6 +13,7 @@ import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; +import com.gregtechceu.gtceu.utils.TagUtil; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; import com.lowdragmc.lowdraglib.gui.texture.ItemStackTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/GhostCircuitSlotWidget.java b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/GhostCircuitSlotWidget.java index c10f85179b8..26a37530d1c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/GhostCircuitSlotWidget.java +++ b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/GhostCircuitSlotWidget.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.api.gui.widget; import com.gregtechceu.gtceu.api.gui.GuiTextures; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; diff --git a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/ProspectingMapWidget.java b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/ProspectingMapWidget.java index 69147b9a09b..56afaf9f62b 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/ProspectingMapWidget.java +++ b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/ProspectingMapWidget.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.gui.misc.ProspectorMode; import com.gregtechceu.gtceu.api.gui.texture.ProspectingTexture; import com.gregtechceu.gtceu.api.item.IComponentItem; -import com.gregtechceu.gtceu.common.item.ProspectorScannerBehavior; +import com.gregtechceu.gtceu.common.item.behavior.ProspectorScannerBehavior; import com.gregtechceu.gtceu.integration.map.WaypointManager; import com.gregtechceu.gtceu.integration.map.cache.client.GTClientCache; import com.gregtechceu.gtceu.integration.map.cache.server.ServerCache; diff --git a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/directional/handlers/CoverableConfigHandler.java b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/directional/handlers/CoverableConfigHandler.java index a6a30fd5190..d20d95c0003 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/gui/widget/directional/handlers/CoverableConfigHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/api/gui/widget/directional/handlers/CoverableConfigHandler.java @@ -13,7 +13,7 @@ import com.gregtechceu.gtceu.api.item.IComponentItem; import com.gregtechceu.gtceu.api.item.component.IItemComponent; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; -import com.gregtechceu.gtceu.common.item.CoverPlaceBehavior; +import com.gregtechceu.gtceu.common.item.behavior.CoverPlaceBehavior; import com.lowdragmc.lowdraglib.gui.texture.GuiTextureGroup; import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/IComponentItem.java b/src/main/java/com/gregtechceu/gtceu/api/item/IComponentItem.java index 7e50f647f82..f50fc976dcf 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/IComponentItem.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/IComponentItem.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.api.item; +import com.gregtechceu.gtceu.api.item.component.IComponentCapability; import com.gregtechceu.gtceu.api.item.component.IItemComponent; -import com.gregtechceu.gtceu.api.item.component.forge.IComponentCapability; import net.minecraft.core.Direction; import net.minecraft.core.NonNullList; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/IGTTool.java b/src/main/java/com/gregtechceu/gtceu/api/item/IGTTool.java index 57dff0347c9..7cf93635c08 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/IGTTool.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/IGTTool.java @@ -11,7 +11,7 @@ import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.capability.ElectricItem; import com.gregtechceu.gtceu.api.item.component.ElectricStats; -import com.gregtechceu.gtceu.api.item.component.forge.IComponentCapability; +import com.gregtechceu.gtceu.api.item.component.IComponentCapability; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.item.tool.IGTToolDefinition; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java b/src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java index 0d79562c552..ab510062fb9 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java @@ -2,12 +2,11 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IElectricItem; import com.gregtechceu.gtceu.api.capability.compat.FeCompat; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.api.item.capability.ElectricItem; -import com.gregtechceu.gtceu.api.item.component.forge.IComponentCapability; import com.gregtechceu.gtceu.client.renderer.item.ToolChargeBarRenderer; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.FormattingUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/component/FilteredFluidContainer.java b/src/main/java/com/gregtechceu/gtceu/api/item/component/FilteredFluidContainer.java index 04279911f02..8d67268a602 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/component/FilteredFluidContainer.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/component/FilteredFluidContainer.java @@ -1,6 +1,5 @@ package com.gregtechceu.gtceu.api.item.component; -import com.gregtechceu.gtceu.api.item.component.forge.IComponentCapability; import com.gregtechceu.gtceu.api.misc.forge.FilteredFluidHandlerItemStack; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/component/forge/IComponentCapability.java b/src/main/java/com/gregtechceu/gtceu/api/item/component/IComponentCapability.java similarity index 85% rename from src/main/java/com/gregtechceu/gtceu/api/item/component/forge/IComponentCapability.java rename to src/main/java/com/gregtechceu/gtceu/api/item/component/IComponentCapability.java index 51f9033d40e..47835e3e6b3 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/component/forge/IComponentCapability.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/component/IComponentCapability.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.item.component.forge; +package com.gregtechceu.gtceu.api.item.component; import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.capabilities.Capability; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/component/ThermalFluidStats.java b/src/main/java/com/gregtechceu/gtceu/api/item/component/ThermalFluidStats.java index 80acd0401c4..18def87d082 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/component/ThermalFluidStats.java +++ b/src/main/java/com/gregtechceu/gtceu/api/item/component/ThermalFluidStats.java @@ -1,7 +1,6 @@ package com.gregtechceu.gtceu.api.item.component; import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties; -import com.gregtechceu.gtceu.api.item.component.forge.IComponentCapability; import com.gregtechceu.gtceu.api.misc.forge.SimpleThermalFluidHandlerItemStack; import com.gregtechceu.gtceu.api.misc.forge.ThermalFluidHandlerItemStack; import com.gregtechceu.gtceu.client.TooltipsHandler; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java index 7609d198079..d5c772d864e 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/MetaMachine.java @@ -9,7 +9,7 @@ import com.gregtechceu.gtceu.api.blockentity.IGregtechBlockEntity; import com.gregtechceu.gtceu.api.blockentity.IPaintable; import com.gregtechceu.gtceu.api.capability.*; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.cover.CoverBehavior; import com.gregtechceu.gtceu.api.data.RotationState; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java index e2e3a655937..a9c1989c72f 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/SimpleTieredMachine.java @@ -22,7 +22,7 @@ import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField; import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.utils.ISubscription; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/CircuitFancyConfigurator.java b/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/CircuitFancyConfigurator.java index 522673f4fc7..dec55d9951c 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/CircuitFancyConfigurator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/fancyconfigurator/CircuitFancyConfigurator.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.gui.fancy.IFancyCustomMiddleClickAction; import com.gregtechceu.gtceu.api.gui.fancy.IFancyCustomMouseWheelAction; import com.gregtechceu.gtceu.api.gui.widget.SlotWidget; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.lang.LangHandler; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IDataInfoProvider.java b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IDataInfoProvider.java index da3d9a5f14c..534effbce38 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IDataInfoProvider.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/feature/IDataInfoProvider.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.api.machine.feature; -import com.gregtechceu.gtceu.common.item.PortableScannerBehavior; +import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Player; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java index 7182caea78a..ad9b2d613be 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/steam/SteamBoilerMachine.java @@ -18,7 +18,7 @@ import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField; import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient; import com.gregtechceu.gtceu.common.data.GTMaterials; -import com.gregtechceu.gtceu.common.item.PortableScannerBehavior; +import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTTransferUtils; diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableComputationContainer.java b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableComputationContainer.java index 4cfb6b28756..f04b8757722 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableComputationContainer.java +++ b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/NotifiableComputationContainer.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.api.machine.trait; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.IOpticalComputationHatch; import com.gregtechceu.gtceu.api.capability.IOpticalComputationProvider; import com.gregtechceu.gtceu.api.capability.IOpticalComputationReceiver; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.api.capability.recipe.*; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/FacadeCoverRecipe.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/FacadeCoverRecipe.java index 7d59cda3a76..7e26452d3e8 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/FacadeCoverRecipe.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/FacadeCoverRecipe.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.common.data.GTMaterials; -import com.gregtechceu.gtceu.common.item.FacadeItemBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.FacadeItemBehaviour; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.NonNullList; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/EnergyStack.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/EnergyStack.java index 1c58ff062e1..2616bb60044 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/EnergyStack.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/EnergyStack.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.api.recipe.ingredient; import com.gregtechceu.gtceu.api.capability.recipe.IO; -import com.gregtechceu.gtceu.api.codec.GTCodecUtils; +import com.gregtechceu.gtceu.utils.codec.GTCodecUtils; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/FluidContainerIngredient.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/FluidContainerIngredient.java index 23a6b33a981..c39b927dd12 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/FluidContainerIngredient.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/FluidContainerIngredient.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.api.recipe.ingredient; import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.data.tag.TagUtil; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntCircuitIngredient.java b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntCircuitIngredient.java index 619ca461b7e..7d1e32d3c78 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntCircuitIngredient.java +++ b/src/main/java/com/gregtechceu/gtceu/api/recipe/ingredient/IntCircuitIngredient.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.common.data.GTItems; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.core.mixins.forge.StrictNBTIngredientAccessor; import net.minecraft.network.FriendlyByteBuf; diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTClientFluidTypeExtensions.java b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTClientFluidTypeExtensions.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTClientFluidTypeExtensions.java rename to src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTClientFluidTypeExtensions.java index d5ea0efd444..a656143af99 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTClientFluidTypeExtensions.java +++ b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTClientFluidTypeExtensions.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.registry.registrate.forge; +package com.gregtechceu.gtceu.api.registry.registrate; import com.gregtechceu.gtceu.GTCEu; diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTFluidBuilder.java b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTFluidBuilder.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTFluidBuilder.java rename to src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTFluidBuilder.java index a10731f6de1..cde6358cc0d 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/forge/GTFluidBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTFluidBuilder.java @@ -1,11 +1,9 @@ -package com.gregtechceu.gtceu.api.registry.registrate.forge; +package com.gregtechceu.gtceu.api.registry.registrate; import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.fluids.FluidState; import com.gregtechceu.gtceu.api.fluids.GTFluid; -import com.gregtechceu.gtceu.api.fluids.forge.GTFluidImpl; -import com.gregtechceu.gtceu.api.item.GTBucketItem; -import com.gregtechceu.gtceu.api.registry.registrate.IGTFluidBuilder; +import com.gregtechceu.gtceu.common.item.GTBucketItem; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.MethodsReturnNonnullByDefault; @@ -60,7 +58,7 @@ @Accessors(chain = true, fluent = true) @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault -public class GTFluidBuilder

extends AbstractBuilder> +public class GTFluidBuilder

extends AbstractBuilder> implements IGTFluidBuilder { @Setter @@ -150,7 +148,7 @@ public GTFluidBuilder

renderType(Supplier layer) { } @SuppressWarnings("deprecation") - protected void registerRenderType(GTFluidImpl.Flowing entry) { + protected void registerRenderType(GTFluid.Flowing entry) { DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> { OneTimeEventReceiver.addModListener(getOwner(), FMLClientSetupEvent.class, $ -> { if (this.layer != null) { @@ -188,11 +186,11 @@ public BlockBuilder> block() { return block(LiquidBlock::new); } - public BlockBuilder> block(NonNullBiFunction, BlockBehaviour.Properties, ? extends B> factory) { + public BlockBuilder> block(NonNullBiFunction, BlockBehaviour.Properties, ? extends B> factory) { if (this.defaultBlock == Boolean.FALSE) { throw new IllegalStateException("Only one call to block/noBlock per builder allowed"); } - NonNullSupplier supplier = asSupplier(); + NonNullSupplier supplier = asSupplier(); return getOwner().>block(this, sourceName, p -> factory.apply(supplier, p)) .properties(p -> BlockBehaviour.Properties.copy(Blocks.WATER).noLootTable()) @@ -284,8 +282,8 @@ private FluidType.Properties makeTypeProperties() { } @Override - protected GTFluidImpl.Flowing createEntry() { - return new GTFluidImpl.Flowing(this.state, () -> this.source.get(), () -> this.get().get(), + protected GTFluid.Flowing createEntry() { + return new GTFluid.Flowing(this.state, () -> this.source.get(), () -> this.get().get(), (() -> this.block != null ? this.block.get() : null), (() -> this.bucket != null ? this.bucket.get() : null), this.burnTime, this.fluidType); } @@ -319,7 +317,7 @@ public IGTFluidBuilder onFluidRegister(Consumer fluidConsumer) { @SuppressWarnings({ "unchecked", "rawtypes" }) @Override - public RegistryEntry register() { + public RegistryEntry register() { // Check the fluid has a type. if (this.fluidType != null) { // Register the type. @@ -331,7 +329,7 @@ public RegistryEntry register() { } if (defaultSource == Boolean.TRUE) { - source(() -> new GTFluidImpl.Source(this.state, () -> this.source.get(), () -> this.get().get(), + source(() -> new GTFluid.Source(this.state, () -> this.source.get(), () -> this.get().get(), (() -> this.block != null ? this.block.get() : null), (() -> this.bucket != null ? this.bucket.get() : null), this.burnTime, this.fluidType)); } diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTRegistrate.java b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTRegistrate.java index 251bc5b670c..63d0f560172 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTRegistrate.java +++ b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/GTRegistrate.java @@ -8,7 +8,6 @@ import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.MultiblockMachineDefinition; -import com.gregtechceu.gtceu.api.registry.registrate.forge.GTFluidBuilder; import com.gregtechceu.gtceu.core.mixins.registrate.AbstractRegistrateAccessor; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/client/forge/ForgeClientEventListener.java b/src/main/java/com/gregtechceu/gtceu/client/ClientEventListener.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/client/forge/ForgeClientEventListener.java rename to src/main/java/com/gregtechceu/gtceu/client/ClientEventListener.java index dfccab975d2..fd7ab140609 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/forge/ForgeClientEventListener.java +++ b/src/main/java/com/gregtechceu/gtceu/client/ClientEventListener.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.client.forge; +package com.gregtechceu.gtceu.client; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; @@ -6,8 +6,6 @@ import com.gregtechceu.gtceu.api.cosmetics.CapeRegistry; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.machine.MetaMachine; -import com.gregtechceu.gtceu.client.EnvironmentalHazardClientHandler; -import com.gregtechceu.gtceu.client.TooltipsHandler; import com.gregtechceu.gtceu.client.renderer.BlockHighlightRenderer; import com.gregtechceu.gtceu.client.renderer.MultiblockInWorldPreviewRenderer; import com.gregtechceu.gtceu.client.renderer.cover.FacadeCoverRenderer; @@ -52,7 +50,7 @@ @Mod.EventBusSubscriber(modid = GTCEu.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT) @OnlyIn(Dist.CLIENT) -public class ForgeClientEventListener { +public class ClientEventListener { @SubscribeEvent public static void onRenderLevelStageEvent(RenderLevelStageEvent event) { diff --git a/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java b/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java index c4bc0f934da..9a0574d59a7 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java +++ b/src/main/java/com/gregtechceu/gtceu/client/ClientProxy.java @@ -6,11 +6,8 @@ import com.gregtechceu.gtceu.api.data.worldgen.GTOreDefinition; import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidDefinition; import com.gregtechceu.gtceu.api.data.worldgen.bedrockore.BedrockOreDefinition; -import com.gregtechceu.gtceu.api.item.DrumMachineItem; import com.gregtechceu.gtceu.api.item.IComponentItem; import com.gregtechceu.gtceu.api.item.IGTTool; -import com.gregtechceu.gtceu.api.item.LampBlockItem; -import com.gregtechceu.gtceu.api.item.QuantumTankMachineItem; import com.gregtechceu.gtceu.client.model.item.FacadeUnbakedModel; import com.gregtechceu.gtceu.client.model.machine.MachineModelLoader; import com.gregtechceu.gtceu.client.model.pipe.PipeModel; @@ -32,6 +29,7 @@ import com.gregtechceu.gtceu.client.renderer.machine.DynamicRenderManager; import com.gregtechceu.gtceu.client.renderer.machine.impl.*; import com.gregtechceu.gtceu.client.renderer.machine.impl.BoilerMultiPartRender; +import com.gregtechceu.gtceu.common.CommonEventListener; import com.gregtechceu.gtceu.common.CommonProxy; import com.gregtechceu.gtceu.common.data.GTBlockEntities; import com.gregtechceu.gtceu.common.data.GTEntityTypes; @@ -39,11 +37,13 @@ import com.gregtechceu.gtceu.common.data.GTParticleTypes; import com.gregtechceu.gtceu.common.data.models.GTModels; import com.gregtechceu.gtceu.common.entity.GTBoat; +import com.gregtechceu.gtceu.common.item.DrumMachineItem; +import com.gregtechceu.gtceu.common.item.LampBlockItem; +import com.gregtechceu.gtceu.common.item.QuantumTankMachineItem; import com.gregtechceu.gtceu.common.machine.owner.MachineOwner; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.model.builder.PipeModelBuilder; import com.gregtechceu.gtceu.data.pack.event.RegisterDynamicResourcesEvent; -import com.gregtechceu.gtceu.forge.ForgeCommonEventListener; import com.gregtechceu.gtceu.integration.kjs.GregTechKubeJSPlugin; import com.gregtechceu.gtceu.integration.map.ClientCacheManager; import com.gregtechceu.gtceu.integration.map.cache.client.GTClientCache; @@ -87,7 +87,7 @@ public static void init() { ClientCacheManager.registerClientCache(GTClientCache.instance, "gtceu"); Layers.registerLayer(OreRenderLayer::new, "ore_veins"); Layers.registerLayer(FluidRenderLayer::new, "bedrock_fluids"); - ForgeCommonEventListener.registerCapes(new RegisterGTCapesEvent()); + CommonEventListener.registerCapes(new RegisterGTCapesEvent()); } initializeDynamicRenders(); } diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/BlockHighlightRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/BlockHighlightRenderer.java index f8c933d7d65..d0a7a3849ec 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/BlockHighlightRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/BlockHighlightRenderer.java @@ -12,7 +12,7 @@ import com.gregtechceu.gtceu.api.pipenet.IPipeType; import com.gregtechceu.gtceu.client.util.PoseStackExtensions; import com.gregtechceu.gtceu.client.util.RenderUtil; -import com.gregtechceu.gtceu.common.item.CoverPlaceBehavior; +import com.gregtechceu.gtceu.common.item.behavior.CoverPlaceBehavior; import com.gregtechceu.gtceu.common.item.tool.rotation.CustomBlockRotations; import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java index 853f9a3e361..268af12e43c 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/block/LampItemRenderer.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.client.renderer.block; -import com.gregtechceu.gtceu.api.item.LampBlockItem; +import com.gregtechceu.gtceu.common.item.LampBlockItem; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer; diff --git a/src/main/java/com/gregtechceu/gtceu/client/renderer/cover/FacadeCoverRenderer.java b/src/main/java/com/gregtechceu/gtceu/client/renderer/cover/FacadeCoverRenderer.java index 84eca1dd9c7..ce935bc334a 100644 --- a/src/main/java/com/gregtechceu/gtceu/client/renderer/cover/FacadeCoverRenderer.java +++ b/src/main/java/com/gregtechceu/gtceu/client/renderer/cover/FacadeCoverRenderer.java @@ -9,7 +9,7 @@ import com.gregtechceu.gtceu.client.util.GTQuadTransformers; import com.gregtechceu.gtceu.client.util.StaticFaceBakery; import com.gregtechceu.gtceu.common.cover.FacadeCover; -import com.gregtechceu.gtceu.common.item.FacadeItemBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.FacadeItemBehaviour; import com.gregtechceu.gtceu.utils.GTUtil; import net.minecraft.Util; diff --git a/src/main/java/com/gregtechceu/gtceu/forge/ForgeCommonEventListener.java b/src/main/java/com/gregtechceu/gtceu/common/CommonEventListener.java similarity index 92% rename from src/main/java/com/gregtechceu/gtceu/forge/ForgeCommonEventListener.java rename to src/main/java/com/gregtechceu/gtceu/common/CommonEventListener.java index b855f3dc6dc..2e03ffa3503 100644 --- a/src/main/java/com/gregtechceu/gtceu/forge/ForgeCommonEventListener.java +++ b/src/main/java/com/gregtechceu/gtceu/common/CommonEventListener.java @@ -1,21 +1,29 @@ -package com.gregtechceu.gtceu.forge; +package com.gregtechceu.gtceu.common; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.block.BlockAttributes; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IElectricItem; import com.gregtechceu.gtceu.api.capability.IMedicalConditionTracker; import com.gregtechceu.gtceu.api.capability.compat.EUToFEProvider; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.api.cosmetics.CapeRegistry; import com.gregtechceu.gtceu.api.cosmetics.event.RegisterGTCapesEvent; import com.gregtechceu.gtceu.api.data.chemical.material.Material; +import com.gregtechceu.gtceu.api.data.chemical.material.event.PostMaterialEvent; +import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.AlloyBlastProperty; +import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty; import com.gregtechceu.gtceu.api.data.chemical.material.properties.HazardProperty; import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.api.fluids.FluidBuilder; +import com.gregtechceu.gtceu.api.fluids.FluidState; +import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; import com.gregtechceu.gtceu.api.item.armor.ArmorComponentItem; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.machine.MetaMachine; @@ -34,9 +42,9 @@ import com.gregtechceu.gtceu.common.data.machines.GTAEMachines; import com.gregtechceu.gtceu.common.fluid.potion.BottleItemFluidHandler; import com.gregtechceu.gtceu.common.fluid.potion.PotionItemFluidHandler; -import com.gregtechceu.gtceu.common.item.ToggleEnergyConsumerBehavior; import com.gregtechceu.gtceu.common.item.armor.IJetpack; import com.gregtechceu.gtceu.common.item.armor.QuarkTechSuite; +import com.gregtechceu.gtceu.common.item.behavior.ToggleEnergyConsumerBehavior; import com.gregtechceu.gtceu.common.machine.owner.MachineOwner; import com.gregtechceu.gtceu.common.network.GTNetwork; import com.gregtechceu.gtceu.common.network.packets.SPacketSendWorldID; @@ -51,6 +59,7 @@ import com.gregtechceu.gtceu.data.loader.BedrockOreLoader; import com.gregtechceu.gtceu.data.loader.GTOreLoader; import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.data.recipe.misc.alloyblast.CustomAlloyBlastRecipeProducer; import com.gregtechceu.gtceu.integration.map.ClientCacheManager; import com.gregtechceu.gtceu.integration.map.WaypointManager; import com.gregtechceu.gtceu.integration.map.cache.server.ServerCache; @@ -105,13 +114,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; import static com.gregtechceu.gtceu.utils.FormattingUtil.toLowerCaseUnderscore; @Mod.EventBusSubscriber(modid = GTCEu.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) -public class ForgeCommonEventListener { +public class CommonEventListener { @SubscribeEvent public static void registerItemStackCapabilities(AttachCapabilitiesEvent event) { @@ -665,4 +675,43 @@ public static void breakSpeed(PlayerEvent.BreakSpeed event) { } } } + + @SubscribeEvent + public static void addAlloyBlastProperties(PostMaterialEvent event) { + for (Material material : GTCEuAPI.materialManager.getRegisteredMaterials()) { + if (!material.hasFlag(MaterialFlags.DISABLE_ALLOY_PROPERTY)) { + addAlloyBlastProperty(material); + } + } + // Alloy Blast Overriding + GTMaterials.NiobiumNitride.getProperty(PropertyKey.ALLOY_BLAST) + .setRecipeProducer(new CustomAlloyBlastRecipeProducer(1, 11, -1)); + + GTMaterials.IndiumTinBariumTitaniumCuprate.getProperty(PropertyKey.ALLOY_BLAST) + .setRecipeProducer(new CustomAlloyBlastRecipeProducer(-1, -1, 16)); + } + + public static void addAlloyBlastProperty(@NotNull Material material) { + final List components = material.getMaterialComponents(); + // ignore materials which are not alloys + if (components.size() < 2) return; + + BlastProperty blastProperty = material.getProperty(PropertyKey.BLAST); + if (blastProperty == null) return; + + if (!material.hasProperty(PropertyKey.FLUID)) return; + + // if there are more than 2 fluid-only components in the material, do not generate a hot fluid + if (components.stream().filter(CommonEventListener::isMaterialStackFluidOnly).limit(3).count() > 2) { + return; + } + + material.setProperty(PropertyKey.ALLOY_BLAST, new AlloyBlastProperty(material.getBlastTemperature())); + material.getProperty(PropertyKey.FLUID).getStorage().enqueueRegistration(FluidStorageKeys.MOLTEN, + new FluidBuilder().state(FluidState.LIQUID)); + } + + private static boolean isMaterialStackFluidOnly(@NotNull MaterialStack ms) { + return !ms.material().hasProperty(PropertyKey.DUST) && ms.material().hasProperty(PropertyKey.FLUID); + } } diff --git a/src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java b/src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java index 53f27507e4d..68b203df551 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java +++ b/src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.addon.AddonFinder; import com.gregtechceu.gtceu.api.addon.IGTAddon; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; import com.gregtechceu.gtceu.api.data.chemical.material.event.MaterialEvent; import com.gregtechceu.gtceu.api.data.chemical.material.event.MaterialRegistryEvent; @@ -45,7 +45,6 @@ import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; import com.gregtechceu.gtceu.data.pack.GTPackSource; import com.gregtechceu.gtceu.data.recipe.GTCraftingComponents; -import com.gregtechceu.gtceu.forge.AlloyBlastPropertyAddition; import com.gregtechceu.gtceu.integration.ae2.GTAEPlaceholders; import com.gregtechceu.gtceu.integration.cctweaked.CCTweakedPlugin; import com.gregtechceu.gtceu.integration.create.GTCreateIntegration; @@ -94,7 +93,6 @@ public CommonProxy() { // used for forge events (ClientProxy + CommonProxy) IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus(); eventBus.register(this); - eventBus.addListener(AlloyBlastPropertyAddition::addAlloyBlastProperties); // must be set here because of KubeJS compat // trying to read this before the pre-init stage GTCEuAPI.materialManager = MaterialRegistryManager.getInstance(); diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/CableBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/CableBlock.java index 1abacd672cb..dacfeefdb21 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/CableBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/CableBlock.java @@ -4,7 +4,7 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.block.MaterialPipeBlock; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.data.chemical.material.properties.WireProperties; diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/DuctPipeBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/DuctPipeBlock.java index 95cffc6ee83..d0fd30a1f4c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/DuctPipeBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/DuctPipeBlock.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.block.PipeBlock; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.feature.IEnvironmentalHazardCleaner; import com.gregtechceu.gtceu.api.machine.feature.IEnvironmentalHazardEmitter; diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/LaserPipeBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/LaserPipeBlock.java index 311338b6a1f..34b8860d158 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/LaserPipeBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/LaserPipeBlock.java @@ -4,7 +4,7 @@ import com.gregtechceu.gtceu.api.block.PipeBlock; import com.gregtechceu.gtceu.api.block.property.GTBlockStateProperties; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.pipenet.IPipeNode; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; diff --git a/src/main/java/com/gregtechceu/gtceu/common/block/OpticalPipeBlock.java b/src/main/java/com/gregtechceu/gtceu/common/block/OpticalPipeBlock.java index c710e296547..63de5f63004 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/block/OpticalPipeBlock.java +++ b/src/main/java/com/gregtechceu/gtceu/common/block/OpticalPipeBlock.java @@ -4,7 +4,7 @@ import com.gregtechceu.gtceu.api.block.PipeBlock; import com.gregtechceu.gtceu.api.block.property.GTBlockStateProperties; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.pipenet.IPipeNode; import com.gregtechceu.gtceu.api.registry.registrate.provider.GTBlockstateProvider; diff --git a/src/main/java/com/gregtechceu/gtceu/common/blockentity/CableBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/common/blockentity/CableBlockEntity.java index 8d33f3c08f4..4adfabd4de4 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/blockentity/CableBlockEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/blockentity/CableBlockEntity.java @@ -2,9 +2,9 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IEnergyContainer; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.api.data.chemical.material.properties.WireProperties; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.item.tool.GTToolType; @@ -14,7 +14,7 @@ import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient; import com.gregtechceu.gtceu.common.block.CableBlock; import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; -import com.gregtechceu.gtceu.common.item.PortableScannerBehavior; +import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.common.pipelike.cable.*; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTMath; diff --git a/src/main/java/com/gregtechceu/gtceu/common/blockentity/DuctPipeBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/common/blockentity/DuctPipeBlockEntity.java index 6a4a060339f..4bfb927d07e 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/blockentity/DuctPipeBlockEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/blockentity/DuctPipeBlockEntity.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.common.blockentity; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IHazardParticleContainer; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.api.machine.feature.IEnvironmentalHazardCleaner; import com.gregtechceu.gtceu.api.machine.feature.IEnvironmentalHazardEmitter; diff --git a/src/main/java/com/gregtechceu/gtceu/common/blockentity/FluidPipeBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/common/blockentity/FluidPipeBlockEntity.java index f4d8c653ed4..e35d87c2c81 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/blockentity/FluidPipeBlockEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/blockentity/FluidPipeBlockEntity.java @@ -2,8 +2,8 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.ICoverable; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.cover.CoverBehavior; import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties; @@ -20,7 +20,7 @@ import com.gregtechceu.gtceu.common.cover.FluidFilterCover; import com.gregtechceu.gtceu.common.cover.PumpCover; import com.gregtechceu.gtceu.common.cover.data.ManualIOMode; -import com.gregtechceu.gtceu.common.item.PortableScannerBehavior; +import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.common.pipelike.fluidpipe.FluidPipeType; import com.gregtechceu.gtceu.common.pipelike.fluidpipe.PipeTankList; import com.gregtechceu.gtceu.utils.EntityDamageUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/blockentity/ItemPipeBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/common/blockentity/ItemPipeBlockEntity.java index f222c06da11..c3743878966 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/blockentity/ItemPipeBlockEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/blockentity/ItemPipeBlockEntity.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.common.blockentity; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.cover.CoverBehavior; import com.gregtechceu.gtceu.api.data.chemical.material.properties.ItemPipeProperties; import com.gregtechceu.gtceu.common.block.ItemPipeBlock; diff --git a/src/main/java/com/gregtechceu/gtceu/common/blockentity/LaserPipeBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/common/blockentity/LaserPipeBlockEntity.java index 4e66ec19415..fa11317d696 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/blockentity/LaserPipeBlockEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/blockentity/LaserPipeBlockEntity.java @@ -2,9 +2,9 @@ import com.gregtechceu.gtceu.api.block.property.GTBlockStateProperties; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.ILaserContainer; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.pipenet.IPipeNode; import com.gregtechceu.gtceu.common.pipelike.laser.*; diff --git a/src/main/java/com/gregtechceu/gtceu/common/blockentity/OpticalPipeBlockEntity.java b/src/main/java/com/gregtechceu/gtceu/common/blockentity/OpticalPipeBlockEntity.java index f6d28f19418..bdadc7fa05c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/blockentity/OpticalPipeBlockEntity.java +++ b/src/main/java/com/gregtechceu/gtceu/common/blockentity/OpticalPipeBlockEntity.java @@ -2,9 +2,9 @@ import com.gregtechceu.gtceu.api.block.property.GTBlockStateProperties; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.IDataAccessHatch; import com.gregtechceu.gtceu.api.capability.IOpticalComputationProvider; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.pipenet.IPipeNode; import com.gregtechceu.gtceu.api.recipe.GTRecipe; diff --git a/src/main/java/com/gregtechceu/gtceu/common/capability/EnvironmentalHazardSavedData.java b/src/main/java/com/gregtechceu/gtceu/common/capability/EnvironmentalHazardSavedData.java index c15fe81bafc..29f6686e0f0 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/capability/EnvironmentalHazardSavedData.java +++ b/src/main/java/com/gregtechceu/gtceu/common/capability/EnvironmentalHazardSavedData.java @@ -296,7 +296,7 @@ public static HazardZone deserializeNBT(CompoundTag zoneTag) { boolean canSpread = zoneTag.getBoolean("can_spread"); HazardProperty.HazardTrigger trigger = HazardProperty.HazardTrigger.ALL_TRIGGERS .get(zoneTag.getString("trigger")); - MedicalCondition condition = com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition.CONDITIONS + MedicalCondition condition = MedicalCondition.CONDITIONS .get(zoneTag.getString("condition")); return new HazardZone(source, strength, canSpread, trigger, condition); diff --git a/src/main/java/com/gregtechceu/gtceu/common/cover/FacadeCover.java b/src/main/java/com/gregtechceu/gtceu/common/cover/FacadeCover.java index 7c4863297b0..642b8cd2419 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/cover/FacadeCover.java +++ b/src/main/java/com/gregtechceu/gtceu/common/cover/FacadeCover.java @@ -6,7 +6,7 @@ import com.gregtechceu.gtceu.api.sync_system.annotations.RerenderOnChanged; import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField; import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient; -import com.gregtechceu.gtceu.common.item.FacadeItemBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.FacadeItemBehaviour; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.BlockPos; diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java index 241aa9101ff..a18dc8236ed 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java @@ -11,7 +11,6 @@ import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; -import com.gregtechceu.gtceu.api.data.tag.TagUtil; import com.gregtechceu.gtceu.api.item.*; import com.gregtechceu.gtceu.api.machine.multiblock.IBatteryData; import com.gregtechceu.gtceu.api.pipenet.longdistance.LongDistancePipeBlock; @@ -19,6 +18,8 @@ import com.gregtechceu.gtceu.common.block.explosive.IndustrialTNTBlock; import com.gregtechceu.gtceu.common.block.explosive.PowderbarrelBlock; import com.gregtechceu.gtceu.common.data.models.GTModels; +import com.gregtechceu.gtceu.common.item.LampBlockItem; +import com.gregtechceu.gtceu.common.item.LaserPipeBlockItem; import com.gregtechceu.gtceu.common.pipelike.duct.DuctPipeType; import com.gregtechceu.gtceu.common.pipelike.fluidpipe.longdistance.LDFluidPipeType; import com.gregtechceu.gtceu.common.pipelike.item.longdistance.LDItemPipeType; @@ -26,6 +27,7 @@ import com.gregtechceu.gtceu.common.pipelike.optical.OpticalPipeType; import com.gregtechceu.gtceu.core.mixins.BlockPropertiesAccessor; import com.gregtechceu.gtceu.data.recipe.CustomTags; +import com.gregtechceu.gtceu.utils.TagUtil; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; import net.minecraft.advancements.critereon.StatePropertiesPredicate; diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTCreativeModeTabs.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTCreativeModeTabs.java index a024f476db8..7bc50d31c7a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTCreativeModeTabs.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTCreativeModeTabs.java @@ -6,10 +6,10 @@ import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.item.IComponentItem; import com.gregtechceu.gtceu.api.item.IGTTool; -import com.gregtechceu.gtceu.api.item.LampBlockItem; import com.gregtechceu.gtceu.api.item.tool.GTToolType; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate; +import com.gregtechceu.gtceu.common.item.LampBlockItem; import com.gregtechceu.gtceu.common.pipelike.cable.Insulation; import net.minecraft.core.NonNullList; diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java index 64cac05549e..7b3b431a1bf 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java @@ -14,7 +14,6 @@ import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialEntry; import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; -import com.gregtechceu.gtceu.api.data.tag.TagUtil; import com.gregtechceu.gtceu.api.gui.misc.ProspectorMode; import com.gregtechceu.gtceu.api.item.ComponentItem; import com.gregtechceu.gtceu.api.item.IComponentItem; @@ -26,15 +25,17 @@ import com.gregtechceu.gtceu.common.entity.GTBoat; import com.gregtechceu.gtceu.common.item.*; import com.gregtechceu.gtceu.common.item.armor.*; +import com.gregtechceu.gtceu.common.item.behavior.*; +import com.gregtechceu.gtceu.common.item.behavior.LighterBehavior; +import com.gregtechceu.gtceu.common.item.behavior.MachineConfigCopyBehaviour; import com.gregtechceu.gtceu.common.item.modules.ImageModuleBehaviour; import com.gregtechceu.gtceu.common.item.modules.TextModuleBehaviour; -import com.gregtechceu.gtceu.common.item.tool.behavior.LighterBehavior; -import com.gregtechceu.gtceu.common.item.tool.behavior.MachineConfigCopyBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.lang.LangHandler; import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; +import com.gregtechceu.gtceu.utils.TagUtil; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; import net.minecraft.client.color.item.ItemColor; diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMachineUtils.java b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMachineUtils.java index 57515764f77..2f881c2b87b 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMachineUtils.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/machines/GTMachineUtils.java @@ -16,8 +16,6 @@ import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; import com.gregtechceu.gtceu.api.fluids.PropertyFluidFilter; -import com.gregtechceu.gtceu.api.item.DrumMachineItem; -import com.gregtechceu.gtceu.api.item.QuantumTankMachineItem; import com.gregtechceu.gtceu.api.machine.*; import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine; import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; @@ -38,6 +36,8 @@ import com.gregtechceu.gtceu.common.block.BoilerFireboxType; import com.gregtechceu.gtceu.common.data.*; import com.gregtechceu.gtceu.common.data.models.GTMachineModels; +import com.gregtechceu.gtceu.common.item.DrumMachineItem; +import com.gregtechceu.gtceu.common.item.QuantumTankMachineItem; import com.gregtechceu.gtceu.common.machine.electric.BatteryBufferMachine; import com.gregtechceu.gtceu.common.machine.electric.ChargerMachine; import com.gregtechceu.gtceu.common.machine.electric.ConverterMachine; diff --git a/src/main/java/com/gregtechceu/gtceu/common/datafixers/TagFixer.java b/src/main/java/com/gregtechceu/gtceu/common/datafixers/TagFixer.java deleted file mode 100644 index 7bf24e1a6a8..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/common/datafixers/TagFixer.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.gregtechceu.gtceu.common.datafixers; - -import com.gregtechceu.gtceu.utils.GTMath; - -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.Tag; - -import java.util.Locale; - -public class TagFixer { - - public static final String[] FLUID_TAGS = { - "currentMilliBucketsPerTick", - "globalTransferSizeMillibuckets", - "minValue", - "maxValue", - }; - - // This is necessary for updating from old versions due to FluidStack long -> int changes - // Any fluid-related long tags need to be turned into int tags - public static void fixFluidTags(CompoundTag tag) { - if (tag.contains("cover", Tag.TAG_COMPOUND)) { - CompoundTag t = tag.getCompound("cover"); - for (String key : t.getAllKeys()) { - var cover = t.getCompound(key); - var id = cover.getCompound("uid").getString("id"); - if ((id.toLowerCase(Locale.ROOT).contains("fluid") || id.toLowerCase(Locale.ROOT).contains("pump"))) { - var data = cover.getCompound("payload").getCompound("d"); - for (String fix_key : FLUID_TAGS) { - if (data.contains(fix_key, Tag.TAG_LONG)) { - var l = data.getLong(fix_key); - data.putInt(fix_key, GTMath.saturatedCast(l)); - } - } - } - } - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/DrumMachineItem.java b/src/main/java/com/gregtechceu/gtceu/common/item/DrumMachineItem.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/api/item/DrumMachineItem.java rename to src/main/java/com/gregtechceu/gtceu/common/item/DrumMachineItem.java index c4dc9e6c6a5..17d5e7fd41d 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/DrumMachineItem.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/DrumMachineItem.java @@ -1,9 +1,10 @@ -package com.gregtechceu.gtceu.api.item; +package com.gregtechceu.gtceu.common.item; import com.gregtechceu.gtceu.api.block.MetaMachineBlock; import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties; import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; +import com.gregtechceu.gtceu.api.item.MetaMachineItem; import com.gregtechceu.gtceu.api.misc.forge.ThermalFluidHandlerItemStack; import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/GTBoatItem.java b/src/main/java/com/gregtechceu/gtceu/common/item/GTBoatItem.java index 945cc8a0098..3b3845b9e3e 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/GTBoatItem.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/GTBoatItem.java @@ -2,6 +2,7 @@ import com.gregtechceu.gtceu.common.entity.GTBoat; import com.gregtechceu.gtceu.common.entity.GTChestBoat; +import com.gregtechceu.gtceu.common.item.behavior.GTBoatItemDispenseBehaviour; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/GTBucketItem.java b/src/main/java/com/gregtechceu/gtceu/common/item/GTBucketItem.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/api/item/GTBucketItem.java rename to src/main/java/com/gregtechceu/gtceu/common/item/GTBucketItem.java index 510a7348163..01d7375ab4d 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/GTBucketItem.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/GTBucketItem.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.item; +package com.gregtechceu.gtceu.common.item; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.data.chemical.material.Material; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/LampBlockItem.java b/src/main/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/item/LampBlockItem.java rename to src/main/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java index edb5174a25a..c1e59d991b2 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/LampBlockItem.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/LampBlockItem.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.item; +package com.gregtechceu.gtceu.common.item; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.client.renderer.block.LampItemRenderer; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/LaserPipeBlockItem.java b/src/main/java/com/gregtechceu/gtceu/common/item/LaserPipeBlockItem.java similarity index 91% rename from src/main/java/com/gregtechceu/gtceu/api/item/LaserPipeBlockItem.java rename to src/main/java/com/gregtechceu/gtceu/common/item/LaserPipeBlockItem.java index 3f34616dc3c..9a0629b52be 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/LaserPipeBlockItem.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/LaserPipeBlockItem.java @@ -1,6 +1,7 @@ -package com.gregtechceu.gtceu.api.item; +package com.gregtechceu.gtceu.common.item; import com.gregtechceu.gtceu.api.block.PipeBlock; +import com.gregtechceu.gtceu.api.item.PipeBlockItem; import com.gregtechceu.gtceu.common.block.LaserPipeBlock; import net.minecraft.client.color.item.ItemColor; diff --git a/src/main/java/com/gregtechceu/gtceu/api/item/QuantumTankMachineItem.java b/src/main/java/com/gregtechceu/gtceu/common/item/QuantumTankMachineItem.java similarity index 92% rename from src/main/java/com/gregtechceu/gtceu/api/item/QuantumTankMachineItem.java rename to src/main/java/com/gregtechceu/gtceu/common/item/QuantumTankMachineItem.java index 65a6b1df1dd..b5ce32473af 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/item/QuantumTankMachineItem.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/QuantumTankMachineItem.java @@ -1,7 +1,8 @@ -package com.gregtechceu.gtceu.api.item; +package com.gregtechceu.gtceu.common.item; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.block.MetaMachineBlock; +import com.gregtechceu.gtceu.api.item.MetaMachineItem; import com.gregtechceu.gtceu.api.misc.forge.QuantumFluidHandlerItemStack; import com.gregtechceu.gtceu.common.machine.storage.QuantumTankMachine; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/armor/PowerlessJetpack.java b/src/main/java/com/gregtechceu/gtceu/common/item/armor/PowerlessJetpack.java index 5da95b7a9b8..4c25ab71dff 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/armor/PowerlessJetpack.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/armor/PowerlessJetpack.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.item.armor.ArmorUtils; import com.gregtechceu.gtceu.api.item.armor.IArmorLogic; import com.gregtechceu.gtceu.api.item.component.*; -import com.gregtechceu.gtceu.api.item.component.forge.IComponentCapability; +import com.gregtechceu.gtceu.api.item.component.IComponentCapability; import com.gregtechceu.gtceu.api.recipe.ingredient.FluidIngredient; import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.utils.GradientUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/AntidoteBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/AntidoteBehavior.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/common/item/AntidoteBehavior.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/AntidoteBehavior.java index fa9729751e0..3046608a508 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/AntidoteBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/AntidoteBehavior.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IMedicalConditionTracker; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/ColorSprayBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ColorSprayBehaviour.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/common/item/ColorSprayBehaviour.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/ColorSprayBehaviour.java index e20d2c282cb..97e3470d53b 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/ColorSprayBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ColorSprayBehaviour.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.blockentity.IPaintable; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/ConsumedBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ConsumedBehaviour.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/common/item/ConsumedBehaviour.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/ConsumedBehaviour.java index feca36f1270..35c04941bdb 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/ConsumedBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ConsumedBehaviour.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/CoverPlaceBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/CoverPlaceBehavior.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/common/item/CoverPlaceBehavior.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/CoverPlaceBehavior.java index 320bd4bc140..57aee262726 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/CoverPlaceBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/CoverPlaceBehavior.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.ICoverable; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/DataItemBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/DataItemBehavior.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/common/item/DataItemBehavior.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/DataItemBehavior.java index 047f36f7484..58a3e79039d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/DataItemBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/DataItemBehavior.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.ICoverable; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/DynamiteBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/DynamiteBehaviour.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/common/item/DynamiteBehaviour.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/DynamiteBehaviour.java index f4bcff20550..0118e81f790 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/DynamiteBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/DynamiteBehaviour.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.item.component.IInteractionItem; import com.gregtechceu.gtceu.common.entity.DynamiteEntity; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/FacadeItemBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/FacadeItemBehaviour.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/common/item/FacadeItemBehaviour.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/FacadeItemBehaviour.java index c4c27d6380c..4a5a4f38df9 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/FacadeItemBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/FacadeItemBehaviour.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.item.component.ICustomDescriptionId; import com.gregtechceu.gtceu.api.item.component.ISubItemHandler; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/FertilizerBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/FertilizerBehavior.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/common/item/FertilizerBehavior.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/FertilizerBehavior.java index 3d44f33e50e..612fc336e33 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/FertilizerBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/FertilizerBehavior.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.item.component.IInteractionItem; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/FluidFilterBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/FluidFilterBehaviour.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/common/item/FluidFilterBehaviour.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/FluidFilterBehaviour.java index e816afb4ccf..a842b379b8c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/FluidFilterBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/FluidFilterBehaviour.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.cover.filter.FluidFilter; import com.gregtechceu.gtceu.api.gui.GuiTextures; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/GTBoatItemDispenseBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/GTBoatItemDispenseBehaviour.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/common/item/GTBoatItemDispenseBehaviour.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/GTBoatItemDispenseBehaviour.java index edad3734666..d0451fb09fd 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/GTBoatItemDispenseBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/GTBoatItemDispenseBehaviour.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.common.entity.GTBoat; import com.gregtechceu.gtceu.common.entity.GTChestBoat; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/IntCircuitBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/IntCircuitBehaviour.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/common/item/IntCircuitBehaviour.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/IntCircuitBehaviour.java index 5661008cfa5..6fc53c26f41 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/IntCircuitBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/IntCircuitBehaviour.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.gui.widget.SlotWidget; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/ItemFilterBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemFilterBehaviour.java similarity index 96% rename from src/main/java/com/gregtechceu/gtceu/common/item/ItemFilterBehaviour.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemFilterBehaviour.java index aac74875106..9e1c1badd2f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/ItemFilterBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemFilterBehaviour.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.cover.filter.ItemFilter; import com.gregtechceu.gtceu.api.gui.GuiTextures; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/ItemMagnetBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemMagnetBehavior.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/common/item/ItemMagnetBehavior.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemMagnetBehavior.java index 4002ff888c5..c0af0800eec 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/ItemMagnetBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ItemMagnetBehavior.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/LighterBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/LighterBehavior.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/LighterBehavior.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/LighterBehavior.java index 72e07cc5c39..bf60c8214ab 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/LighterBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/LighterBehavior.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item.tool.behavior; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.item.component.IAddInformation; import com.gregtechceu.gtceu.api.item.component.IDurabilityBar; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/MachineConfigCopyBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/MachineConfigCopyBehaviour.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/MachineConfigCopyBehaviour.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/MachineConfigCopyBehaviour.java index 88434f8236d..64776f5f582 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/MachineConfigCopyBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/MachineConfigCopyBehaviour.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item.tool.behavior; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; import com.gregtechceu.gtceu.api.item.component.IAddInformation; @@ -6,7 +6,6 @@ import com.gregtechceu.gtceu.api.machine.MetaMachine; import com.gregtechceu.gtceu.api.machine.feature.*; import com.gregtechceu.gtceu.api.machine.trait.AutoOutputTrait; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; import com.gregtechceu.gtceu.common.machine.owner.MachineOwner; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/NanoSaberBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/NanoSaberBehavior.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/common/item/NanoSaberBehavior.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/NanoSaberBehavior.java index c2fa9cbf5ef..37ed298b630 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/NanoSaberBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/NanoSaberBehavior.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.item.component.IEnchantableItem; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/PortableScannerBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/PortableScannerBehavior.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/common/item/PortableScannerBehavior.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/PortableScannerBehavior.java index b23654b2d24..fa7cc09023a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/PortableScannerBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/PortableScannerBehavior.java @@ -1,10 +1,10 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.block.property.GTBlockStateProperties; import com.gregtechceu.gtceu.api.blockentity.PipeBlockEntity; import com.gregtechceu.gtceu.api.capability.*; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.data.worldgen.bedrockfluid.BedrockFluidVeinSavedData; import com.gregtechceu.gtceu.api.gui.misc.ProspectorMode; import com.gregtechceu.gtceu.api.item.component.IAddInformation; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/ProspectorScannerBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ProspectorScannerBehavior.java similarity index 99% rename from src/main/java/com/gregtechceu/gtceu/common/item/ProspectorScannerBehavior.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/ProspectorScannerBehavior.java index f0a393bd457..33de34a5288 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/ProspectorScannerBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ProspectorScannerBehavior.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IElectricItem; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/TapeBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/TapeBehaviour.java similarity index 90% rename from src/main/java/com/gregtechceu/gtceu/common/item/TapeBehaviour.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/TapeBehaviour.java index af76b0a04c7..917e77f04c8 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/TapeBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/TapeBehaviour.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.item.component.IInteractionItem; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/TerminalBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/TerminalBehavior.java similarity index 97% rename from src/main/java/com/gregtechceu/gtceu/common/item/TerminalBehavior.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/TerminalBehavior.java index 2402ee1113d..e761841727f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/TerminalBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/TerminalBehavior.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.item.component.IInteractionItem; import com.gregtechceu.gtceu.api.machine.MetaMachine; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/ToggleEnergyConsumerBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ToggleEnergyConsumerBehavior.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/common/item/ToggleEnergyConsumerBehavior.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/ToggleEnergyConsumerBehavior.java index 90d0d1ad649..3bde4751251 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/ToggleEnergyConsumerBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/ToggleEnergyConsumerBehavior.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IElectricItem; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/TooltipBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/TooltipBehavior.java similarity index 94% rename from src/main/java/com/gregtechceu/gtceu/common/item/TooltipBehavior.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/TooltipBehavior.java index df6d1faec04..00c1b336582 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/TooltipBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/TooltipBehavior.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.item.component.IAddInformation; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/TurbineRotorBehaviour.java b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/TurbineRotorBehaviour.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/common/item/TurbineRotorBehaviour.java rename to src/main/java/com/gregtechceu/gtceu/common/item/behavior/TurbineRotorBehaviour.java index 482519ee168..24d2a6a2e03 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/TurbineRotorBehaviour.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/behavior/TurbineRotorBehaviour.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.item; +package com.gregtechceu.gtceu.common.item.behavior; import com.gregtechceu.gtceu.api.GTCEuAPI; import com.gregtechceu.gtceu.api.data.chemical.material.Material; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/PlungerBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/PlungerBehavior.java index 3380aadc391..3b8a25a97a2 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/PlungerBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/PlungerBehavior.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.common.item.tool.behavior; +import com.gregtechceu.gtceu.api.item.component.IComponentCapability; import com.gregtechceu.gtceu.api.item.component.IInteractionItem; -import com.gregtechceu.gtceu.api.item.component.forge.IComponentCapability; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; import com.gregtechceu.gtceu.api.machine.MetaMachine; diff --git a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/TorchPlaceBehavior.java b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/TorchPlaceBehavior.java index 773e0966f44..6320f51ee80 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/TorchPlaceBehavior.java +++ b/src/main/java/com/gregtechceu/gtceu/common/item/tool/behavior/TorchPlaceBehavior.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.common.item.tool.behavior; -import com.gregtechceu.gtceu.api.data.tag.TagUtil; import com.gregtechceu.gtceu.api.item.tool.ToolHelper; import com.gregtechceu.gtceu.api.item.tool.behavior.IToolBehavior; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java index a2bb710eaf2..568026f5d3a 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/electric/MinerMachine.java @@ -18,7 +18,7 @@ import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField; import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; -import com.gregtechceu.gtceu.common.item.PortableScannerBehavior; +import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.common.machine.trait.miner.MinerLogic; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.lang.LangHandler; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CentralMonitorMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CentralMonitorMachine.java index 84cf9d94b28..f933bdb3e2b 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CentralMonitorMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CentralMonitorMachine.java @@ -23,7 +23,7 @@ import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient; import com.gregtechceu.gtceu.common.data.GTBlocks; import com.gregtechceu.gtceu.common.data.GTMachines; -import com.gregtechceu.gtceu.common.item.PortableScannerBehavior; +import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.common.machine.multiblock.electric.monitor.MonitorGroup; import com.gregtechceu.gtceu.common.machine.trait.CentralMonitorLogic; import com.gregtechceu.gtceu.common.network.GTNetwork; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java index 46006d60b70..71eebec39bf 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java @@ -26,7 +26,7 @@ import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField; import com.gregtechceu.gtceu.common.data.GTBlocks; import com.gregtechceu.gtceu.common.data.GTMachines; -import com.gregtechceu.gtceu.common.item.PortableScannerBehavior; +import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.common.machine.electric.HullMachine; import com.gregtechceu.gtceu.common.machine.multiblock.generator.LargeCombustionEngineMachine; import com.gregtechceu.gtceu.common.machine.multiblock.generator.LargeTurbineMachine; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/LargeMinerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/LargeMinerMachine.java index a2f4a715e9b..48e613f5492 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/LargeMinerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/LargeMinerMachine.java @@ -16,7 +16,7 @@ import com.gregtechceu.gtceu.api.transfer.fluid.FluidHandlerList; import com.gregtechceu.gtceu.common.data.GTBlocks; import com.gregtechceu.gtceu.common.data.GTMaterials; -import com.gregtechceu.gtceu.common.item.PortableScannerBehavior; +import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.common.machine.trait.miner.LargeMinerLogic; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.gregtechceu.gtceu.utils.GTUtil; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/ResearchStationMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/ResearchStationMachine.java index c4e8ed6f154..019a6ade85f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/ResearchStationMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/research/ResearchStationMachine.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.common.machine.multiblock.electric.research; import com.gregtechceu.gtceu.api.blockentity.BlockEntityCreationInfo; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.IOpticalComputationProvider; import com.gregtechceu.gtceu.api.capability.IOpticalComputationReceiver; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.api.capability.recipe.CWURecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DataAccessHatchMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DataAccessHatchMachine.java index 4009a885b10..e332a06f651 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DataAccessHatchMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DataAccessHatchMachine.java @@ -16,7 +16,7 @@ import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField; import com.gregtechceu.gtceu.common.data.GTRecipeTypes; -import com.gregtechceu.gtceu.common.item.PortableScannerBehavior; +import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.common.machine.multiblock.electric.research.DataBankMachine; import com.gregtechceu.gtceu.common.recipe.condition.ResearchCondition; import com.gregtechceu.gtceu.utils.ItemStackHashStrategy; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/FluidHatchPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/FluidHatchPartMachine.java index e8bf27a31fb..9fd53a92fd6 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/FluidHatchPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/FluidHatchPartMachine.java @@ -19,7 +19,7 @@ import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField; import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient; import com.gregtechceu.gtceu.common.data.GTMachines; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.gregtechceu.gtceu.utils.ISubscription; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java index 0660dbb5c56..71cebb9c6cf 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/ItemBusPartMachine.java @@ -20,7 +20,7 @@ import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField; import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient; import com.gregtechceu.gtceu.common.data.GTMachines; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.gregtechceu.gtceu.utils.ISubscription; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/LaserHatchPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/LaserHatchPartMachine.java index 27d21392633..c3bc038a5cf 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/LaserHatchPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/LaserHatchPartMachine.java @@ -7,7 +7,7 @@ import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredIOPartMachine; import com.gregtechceu.gtceu.api.machine.trait.NotifiableLaserContainer; import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField; -import com.gregtechceu.gtceu.common.item.PortableScannerBehavior; +import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/OpticalDataHatchMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/OpticalDataHatchMachine.java index ea68cddff72..be745807be5 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/OpticalDataHatchMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/OpticalDataHatchMachine.java @@ -1,9 +1,9 @@ package com.gregtechceu.gtceu.common.machine.multiblock.part; import com.gregtechceu.gtceu.api.blockentity.BlockEntityCreationInfo; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.IDataAccessHatch; import com.gregtechceu.gtceu.api.capability.IOpticalDataAccessHatch; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.api.machine.feature.multiblock.IWorkableMultiController; import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine; import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/RotorHolderPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/RotorHolderPartMachine.java index 26201a8a62e..934172bcdce 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/RotorHolderPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/RotorHolderPartMachine.java @@ -19,7 +19,7 @@ import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient; import com.gregtechceu.gtceu.common.data.GTDamageTypes; import com.gregtechceu.gtceu.common.data.GTMaterials; -import com.gregtechceu.gtceu.common.item.TurbineRotorBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.TurbineRotorBehaviour; import com.gregtechceu.gtceu.utils.ISubscription; import com.lowdragmc.lowdraglib.gui.widget.Widget; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java index c1daf9ad56e..b7a05fa2d02 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java @@ -13,7 +13,7 @@ import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient; import com.gregtechceu.gtceu.common.data.GTBlocks; -import com.gregtechceu.gtceu.common.item.tool.behavior.LighterBehavior; +import com.gregtechceu.gtceu.common.item.behavior.LighterBehavior; import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.lowdragmc.lowdraglib.utils.BlockInfo; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/steam/SteamMinerMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/steam/SteamMinerMachine.java index 664a0cb5a73..a00f06e683f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/steam/SteamMinerMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/steam/SteamMinerMachine.java @@ -14,7 +14,7 @@ import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField; import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient; -import com.gregtechceu.gtceu.common.item.PortableScannerBehavior; +import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.common.machine.trait.miner.SteamMinerLogic; import com.gregtechceu.gtceu.utils.GTTransferUtils; import com.gregtechceu.gtceu.utils.ISubscription; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/LongDistanceEndpointMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/LongDistanceEndpointMachine.java index 5ab331b46a8..abd4454b021 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/storage/LongDistanceEndpointMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/storage/LongDistanceEndpointMachine.java @@ -9,7 +9,7 @@ import com.gregtechceu.gtceu.api.pipenet.longdistance.LongDistanceNetwork; import com.gregtechceu.gtceu.api.pipenet.longdistance.LongDistancePipeType; import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField; -import com.gregtechceu.gtceu.common.item.PortableScannerBehavior; +import com.gregtechceu.gtceu.common.item.behavior.PortableScannerBehavior; import com.gregtechceu.gtceu.utils.FormattingUtil; import net.minecraft.MethodsReturnNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/ArcFurnaceLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/ArcFurnaceLogic.java index 5a9d9c32d3e..05b6059f338 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/ArcFurnaceLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/ArcFurnaceLogic.java @@ -13,7 +13,7 @@ import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.common.data.GTMaterialItems; import com.gregtechceu.gtceu.common.data.GTMaterials; -import com.gregtechceu.gtceu.common.item.TurbineRotorBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.TurbineRotorBehaviour; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/BreweryLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/BreweryLogic.java index 065d89b49ee..560ca7cb862 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/BreweryLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/BreweryLogic.java @@ -5,7 +5,6 @@ import com.gregtechceu.gtceu.api.capability.recipe.IRecipeCapabilityHolder; import com.gregtechceu.gtceu.api.capability.recipe.IRecipeHandler; import com.gregtechceu.gtceu.api.capability.recipe.ItemRecipeCapability; -import com.gregtechceu.gtceu.api.data.tag.TagUtil; import com.gregtechceu.gtceu.api.machine.trait.RecipeHandlerList; import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; @@ -13,6 +12,7 @@ import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.fluid.potion.PotionFluidHelper; import com.gregtechceu.gtceu.core.mixins.PotionBrewingAccessor; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.Util; import net.minecraft.core.registries.BuiltInRegistries; diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/MaceratorLogic.java b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/MaceratorLogic.java index e1eea214c9c..a2f219c094f 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/MaceratorLogic.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/trait/customlogic/MaceratorLogic.java @@ -13,7 +13,7 @@ import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.common.data.GTMaterialItems; import com.gregtechceu.gtceu.common.data.GTMaterials; -import com.gregtechceu.gtceu.common.item.TurbineRotorBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.TurbineRotorBehaviour; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/CableData.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/CableData.java deleted file mode 100644 index 92cd9b26a9d..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/CableData.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.gregtechceu.gtceu.common.pipelike.cable; - -import com.gregtechceu.gtceu.api.data.chemical.material.properties.WireProperties; -import com.gregtechceu.gtceu.api.pipenet.IAttachData; -import com.gregtechceu.gtceu.utils.GTMath; - -import net.minecraft.core.Direction; - -import lombok.Getter; -import lombok.experimental.Accessors; - -@Accessors(fluent = true) -public class CableData implements IAttachData { - - @Getter - WireProperties properties; - @Getter - byte connections; - - public CableData(WireProperties properties, byte connections) { - this.properties = properties; - this.connections = connections; - } - - @Override - public boolean canAttachTo(Direction side) { - return (connections & (1 << side.ordinal())) != 0; - } - - @Override - public boolean setAttached(Direction side, boolean attach) { - var result = canAttachTo(side); - if (result != attach) { - if (attach) { - connections |= (1 << side.ordinal()); - } else { - connections &= ~(1 << side.ordinal()); - } - } - return result != attach; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof CableData cableData) { - return cableData.properties.equals(properties) && connections == cableData.connections; - } - return super.equals(obj); - } - - @Override - public int hashCode() { - return GTMath.hashInts(properties.hashCode(), connections); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNetWalker.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNetWalker.java index c4404a0f6d7..12922071459 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNetWalker.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/cable/EnergyNetWalker.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.common.pipelike.cable; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.IEnergyContainer; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.api.data.chemical.material.properties.WireProperties; import com.gregtechceu.gtceu.api.pipenet.PipeNetWalker; import com.gregtechceu.gtceu.common.blockentity.CableBlockEntity; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/duct/DuctNetWalker.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/duct/DuctNetWalker.java index 46878c50127..62c136bfb3c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/duct/DuctNetWalker.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/duct/DuctNetWalker.java @@ -1,8 +1,8 @@ package com.gregtechceu.gtceu.common.pipelike.duct; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.IHazardParticleContainer; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.api.pipenet.PipeNetWalker; import com.gregtechceu.gtceu.common.blockentity.DuctPipeBlockEntity; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeData.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeData.java deleted file mode 100644 index 74094435d10..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/FluidPipeData.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.gregtechceu.gtceu.common.pipelike.fluidpipe; - -import com.gregtechceu.gtceu.api.data.chemical.material.properties.FluidPipeProperties; -import com.gregtechceu.gtceu.api.pipenet.IAttachData; -import com.gregtechceu.gtceu.utils.GTMath; - -import net.minecraft.core.Direction; - -import lombok.Getter; -import lombok.experimental.Accessors; - -@Accessors(fluent = true) -public class FluidPipeData implements IAttachData { - - @Getter - FluidPipeProperties properties; - @Getter - byte connections; - - public FluidPipeData(FluidPipeProperties properties, byte connections) { - this.properties = properties; - this.connections = connections; - } - - @Override - public boolean canAttachTo(Direction side) { - return (connections & (1 << side.ordinal())) != 0; - } - - @Override - public boolean setAttached(Direction side, boolean attach) { - var result = canAttachTo(side); - if (result != attach) { - if (attach) { - connections |= (1 << side.ordinal()); - } else { - connections &= ~(1 << side.ordinal()); - } - } - return result != attach; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof FluidPipeData cableData) { - return cableData.properties.equals(properties) && connections == cableData.connections; - } - return super.equals(obj); - } - - @Override - public int hashCode() { - return GTMath.hashInts(properties.hashCode(), connections); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/PipeNetRoutePath.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/PipeNetRoutePath.java deleted file mode 100644 index 89d94566d4a..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/fluidpipe/PipeNetRoutePath.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.gregtechceu.gtceu.common.pipelike.fluidpipe; - -import com.gregtechceu.gtceu.api.pipenet.IRoutePath; -import com.gregtechceu.gtceu.utils.GTTransferUtils; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.world.level.Level; -import net.minecraftforge.fluids.capability.IFluidHandler; - -import lombok.Getter; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import oshi.util.tuples.Pair; - -public class PipeNetRoutePath implements IRoutePath { - - @Getter - private final BlockPos pipePos; - @Getter - private final Direction targetFacing; - @Getter - private final int distance; - private final Pair[] path; - - public PipeNetRoutePath(BlockPos pipePos, Direction targetFacing, Pair[] path, - int distance) { - this.pipePos = pipePos; - this.targetFacing = targetFacing; - this.path = path; - this.distance = distance; - } - - public Pair[] getPath() { - return path; - } - - @Override - @NotNull - public BlockPos getTargetPipePos() { - return pipePos.relative(targetFacing); - } - - @Nullable - public IFluidHandler getHandler(Level world) { - return GTTransferUtils.getAdjacentFluidHandler(world, pipePos, targetFacing).resolve().orElse(null); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemPipeData.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemPipeData.java deleted file mode 100644 index 7f0a1193700..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/item/ItemPipeData.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.gregtechceu.gtceu.common.pipelike.item; - -import com.gregtechceu.gtceu.api.data.chemical.material.properties.ItemPipeProperties; -import com.gregtechceu.gtceu.api.pipenet.IAttachData; -import com.gregtechceu.gtceu.utils.GTMath; - -import net.minecraft.core.Direction; - -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.experimental.Accessors; - -@Accessors(fluent = true) -@AllArgsConstructor -public class ItemPipeData implements IAttachData { - - @Getter - ItemPipeProperties properties; - @Getter - byte connections; - - @Override - public boolean canAttachTo(Direction side) { - return (connections & (1 << side.ordinal())) != 0; - } - - @Override - public boolean setAttached(Direction side, boolean attach) { - var result = canAttachTo(side); - if (result != attach) { - if (attach) { - connections |= (1 << side.ordinal()); - } else { - connections &= ~(1 << side.ordinal()); - } - } - return result != attach; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof ItemPipeData cableData) { - return cableData.properties.equals(properties) && connections == cableData.connections; - } - return super.equals(obj); - } - - @Override - public int hashCode() { - return GTMath.hashInts(properties.hashCode(), connections); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/laser/LaserNetWalker.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/laser/LaserNetWalker.java index 1dc939e15e0..bf3bed65d68 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/laser/LaserNetWalker.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/laser/LaserNetWalker.java @@ -1,7 +1,7 @@ package com.gregtechceu.gtceu.common.pipelike.laser; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.ILaserContainer; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.api.pipenet.PipeNetWalker; import com.gregtechceu.gtceu.common.blockentity.LaserPipeBlockEntity; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/optical/OpticalNetWalker.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/optical/OpticalNetWalker.java index 16711b1e8a3..dbf79210f4d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/optical/OpticalNetWalker.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/optical/OpticalNetWalker.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.common.pipelike.optical; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.pipenet.PipeNetWalker; import com.gregtechceu.gtceu.common.blockentity.OpticalPipeBlockEntity; diff --git a/src/main/java/com/gregtechceu/gtceu/common/pipelike/optical/OpticalRoutePath.java b/src/main/java/com/gregtechceu/gtceu/common/pipelike/optical/OpticalRoutePath.java index a05cc0d1718..9f9b63f5dbb 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/pipelike/optical/OpticalRoutePath.java +++ b/src/main/java/com/gregtechceu/gtceu/common/pipelike/optical/OpticalRoutePath.java @@ -1,10 +1,10 @@ package com.gregtechceu.gtceu.common.pipelike.optical; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.capability.IDataAccessHatch; import com.gregtechceu.gtceu.api.capability.IOpticalComputationProvider; import com.gregtechceu.gtceu.api.capability.IOpticalDataAccessHatch; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; import com.gregtechceu.gtceu.api.pipenet.IRoutePath; import com.gregtechceu.gtceu.common.blockentity.OpticalPipeBlockEntity; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentBlockCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentBlockCondition.java index 14bb3a39623..af779321ea4 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentBlockCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentBlockCondition.java @@ -1,12 +1,12 @@ package com.gregtechceu.gtceu.common.recipe.condition; -import com.gregtechceu.gtceu.api.codec.GTCodecUtils; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import com.gregtechceu.gtceu.utils.GTUtil; +import com.gregtechceu.gtceu.utils.codec.GTCodecUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderSet; diff --git a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentFluidCondition.java b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentFluidCondition.java index 8efbde197a2..34268e3ed9b 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentFluidCondition.java +++ b/src/main/java/com/gregtechceu/gtceu/common/recipe/condition/AdjacentFluidCondition.java @@ -1,12 +1,12 @@ package com.gregtechceu.gtceu.common.recipe.condition; -import com.gregtechceu.gtceu.api.codec.GTCodecUtils; import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic; import com.gregtechceu.gtceu.api.recipe.GTRecipe; import com.gregtechceu.gtceu.api.recipe.RecipeCondition; import com.gregtechceu.gtceu.api.recipe.condition.RecipeConditionType; import com.gregtechceu.gtceu.common.data.GTRecipeConditions; import com.gregtechceu.gtceu.utils.GTUtil; +import com.gregtechceu.gtceu.utils.codec.GTCodecUtils; import net.minecraft.core.BlockPos; import net.minecraft.core.HolderSet; diff --git a/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java b/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java index 75ace433779..d332f7f3d9f 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java +++ b/src/main/java/com/gregtechceu/gtceu/core/MixinHelpers.java @@ -16,7 +16,7 @@ import com.gregtechceu.gtceu.api.fluids.store.FluidStorage; import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKey; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.api.registry.registrate.forge.GTClientFluidTypeExtensions; +import com.gregtechceu.gtceu.api.registry.registrate.GTClientFluidTypeExtensions; import com.gregtechceu.gtceu.common.data.GTMaterialBlocks; import com.gregtechceu.gtceu.common.data.GTMaterialItems; import com.gregtechceu.gtceu.config.ConfigHolder; diff --git a/src/main/java/com/gregtechceu/gtceu/data/forge/DataGenerators.java b/src/main/java/com/gregtechceu/gtceu/data/DataGenerators.java similarity index 92% rename from src/main/java/com/gregtechceu/gtceu/data/forge/DataGenerators.java rename to src/main/java/com/gregtechceu/gtceu/data/DataGenerators.java index c88ef6d0daf..2471cceaff5 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/forge/DataGenerators.java +++ b/src/main/java/com/gregtechceu/gtceu/data/DataGenerators.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.data.forge; +package com.gregtechceu.gtceu.data; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.registry.registrate.SoundEntryBuilder; @@ -8,7 +8,7 @@ import com.gregtechceu.gtceu.common.data.GTPlacements; import com.gregtechceu.gtceu.common.data.GTWorldgen; import com.gregtechceu.gtceu.data.tags.BiomeTagsLoader; -import com.gregtechceu.gtceu.data.tags.DamageTagsLoader; +import com.gregtechceu.gtceu.data.tags.DamageTypeTagsLoader; import net.minecraft.core.RegistrySetBuilder; import net.minecraft.core.registries.Registries; @@ -47,7 +47,7 @@ packOutput, registries, new RegistrySetBuilder() .add(ForgeRegistries.Keys.BIOME_MODIFIERS, GTBiomeModifiers::bootstrap), set)); generator.addProvider(true, - new DamageTagsLoader(packOutput, provider.getRegistryProvider(), existingFileHelper)); + new DamageTypeTagsLoader(packOutput, provider.getRegistryProvider(), existingFileHelper)); } } } diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/CustomTags.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/CustomTags.java index fdaa30c2445..9f56d2441a9 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/CustomTags.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/CustomTags.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.data.recipe; -import com.gregtechceu.gtceu.api.data.tag.TagUtil; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/WoodTypeEntry.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/WoodTypeEntry.java index 48c07dae04a..1f4de2d9e39 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/WoodTypeEntry.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/WoodTypeEntry.java @@ -3,8 +3,8 @@ import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; -import com.gregtechceu.gtceu.api.data.tag.TagUtil; import com.gregtechceu.gtceu.common.data.GTMaterials; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/GTRecipeBuilder.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/GTRecipeBuilder.java index eb97eff4d6d..bc7f4d61d81 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/GTRecipeBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/builder/GTRecipeBuilder.java @@ -11,7 +11,6 @@ import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; import com.gregtechceu.gtceu.api.data.medicalcondition.MedicalCondition; import com.gregtechceu.gtceu.api.data.tag.TagPrefix; -import com.gregtechceu.gtceu.api.data.tag.TagUtil; import com.gregtechceu.gtceu.api.item.component.IDataItem; import com.gregtechceu.gtceu.api.machine.MachineDefinition; import com.gregtechceu.gtceu.api.machine.multiblock.CleanroomType; @@ -23,11 +22,12 @@ import com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate.NBTPredicate; import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.common.data.GTRecipeTypes; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.common.recipe.condition.*; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.GTUtil; import com.gregtechceu.gtceu.utils.ResearchManager; +import com.gregtechceu.gtceu.utils.TagUtil; import net.minecraft.MethodsReturnNonnullByDefault; import net.minecraft.core.HolderSet; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PartsRecipeHandler.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PartsRecipeHandler.java index d29bb429d81..c7305d941f5 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PartsRecipeHandler.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/generated/PartsRecipeHandler.java @@ -8,7 +8,7 @@ import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.data.GTRecipeCategories; -import com.gregtechceu.gtceu.common.item.TurbineRotorBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.TurbineRotorBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; diff --git a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CustomToolRecipes.java b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CustomToolRecipes.java index a5510ac10c5..e654851a7cd 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CustomToolRecipes.java +++ b/src/main/java/com/gregtechceu/gtceu/data/recipe/misc/CustomToolRecipes.java @@ -13,7 +13,7 @@ import com.gregtechceu.gtceu.api.recipe.ToolHeadReplaceRecipe; import com.gregtechceu.gtceu.common.data.GTItems; import com.gregtechceu.gtceu.common.data.GTMaterials; -import com.gregtechceu.gtceu.common.item.ItemMagnetBehavior; +import com.gregtechceu.gtceu.common.item.behavior.ItemMagnetBehavior; import com.gregtechceu.gtceu.data.recipe.CustomTags; import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper; import com.gregtechceu.gtceu.utils.ToolItemHelper; diff --git a/src/main/java/com/gregtechceu/gtceu/data/tags/DamageTagsLoader.java b/src/main/java/com/gregtechceu/gtceu/data/tags/DamageTypeTagsLoader.java similarity index 77% rename from src/main/java/com/gregtechceu/gtceu/data/tags/DamageTagsLoader.java rename to src/main/java/com/gregtechceu/gtceu/data/tags/DamageTypeTagsLoader.java index f1c32331e17..9b98b15027d 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/tags/DamageTagsLoader.java +++ b/src/main/java/com/gregtechceu/gtceu/data/tags/DamageTypeTagsLoader.java @@ -14,10 +14,10 @@ import java.util.concurrent.CompletableFuture; -public class DamageTagsLoader extends TagsProvider { +public class DamageTypeTagsLoader extends TagsProvider { - public DamageTagsLoader(PackOutput arg, CompletableFuture completableFuture, - @Nullable ExistingFileHelper existingFileHelper) { + public DamageTypeTagsLoader(PackOutput arg, CompletableFuture completableFuture, + @Nullable ExistingFileHelper existingFileHelper) { super(arg, Registries.DAMAGE_TYPE, completableFuture, GTCEu.MOD_ID, existingFileHelper); } diff --git a/src/main/java/com/gregtechceu/gtceu/forge/AlloyBlastPropertyAddition.java b/src/main/java/com/gregtechceu/gtceu/forge/AlloyBlastPropertyAddition.java deleted file mode 100644 index 8876472dc78..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/forge/AlloyBlastPropertyAddition.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.gregtechceu.gtceu.forge; - -import com.gregtechceu.gtceu.api.GTCEuAPI; -import com.gregtechceu.gtceu.api.data.chemical.material.Material; -import com.gregtechceu.gtceu.api.data.chemical.material.event.PostMaterialEvent; -import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags; -import com.gregtechceu.gtceu.api.data.chemical.material.properties.AlloyBlastProperty; -import com.gregtechceu.gtceu.api.data.chemical.material.properties.BlastProperty; -import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey; -import com.gregtechceu.gtceu.api.data.chemical.material.stack.MaterialStack; -import com.gregtechceu.gtceu.api.fluids.FluidBuilder; -import com.gregtechceu.gtceu.api.fluids.FluidState; -import com.gregtechceu.gtceu.api.fluids.store.FluidStorageKeys; -import com.gregtechceu.gtceu.common.data.GTMaterials; -import com.gregtechceu.gtceu.data.recipe.misc.alloyblast.CustomAlloyBlastRecipeProducer; - -import net.minecraftforge.eventbus.api.SubscribeEvent; - -import org.jetbrains.annotations.NotNull; - -import java.util.List; - -/** - * Listen to PostMaterialEvent instead of doing this directly because it's a lot cleaner this way. - */ -// @Mod.EventBusSubscriber(modid = GTCEu.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) -public class AlloyBlastPropertyAddition { - - @SubscribeEvent - public static void addAlloyBlastProperties(PostMaterialEvent event) { - for (Material material : GTCEuAPI.materialManager.getRegisteredMaterials()) { - if (!material.hasFlag(MaterialFlags.DISABLE_ALLOY_PROPERTY)) { - addAlloyBlastProperty(material); - } - } - // Alloy Blast Overriding - GTMaterials.NiobiumNitride.getProperty(PropertyKey.ALLOY_BLAST) - .setRecipeProducer(new CustomAlloyBlastRecipeProducer(1, 11, -1)); - - GTMaterials.IndiumTinBariumTitaniumCuprate.getProperty(PropertyKey.ALLOY_BLAST) - .setRecipeProducer(new CustomAlloyBlastRecipeProducer(-1, -1, 16)); - } - - public static void addAlloyBlastProperty(@NotNull Material material) { - final List components = material.getMaterialComponents(); - // ignore materials which are not alloys - if (components.size() < 2) return; - - BlastProperty blastProperty = material.getProperty(PropertyKey.BLAST); - if (blastProperty == null) return; - - if (!material.hasProperty(PropertyKey.FLUID)) return; - - // if there are more than 2 fluid-only components in the material, do not generate a hot fluid - if (components.stream().filter(AlloyBlastPropertyAddition::isMaterialStackFluidOnly).limit(3).count() > 2) { - return; - } - - material.setProperty(PropertyKey.ALLOY_BLAST, new AlloyBlastProperty(material.getBlastTemperature())); - material.getProperty(PropertyKey.FLUID).getStorage().enqueueRegistration(FluidStorageKeys.MOLTEN, - new FluidBuilder().state(FluidState.LIQUID)); - } - - private static boolean isMaterialStackFluidOnly(@NotNull MaterialStack ms) { - return !ms.material().hasProperty(PropertyKey.DUST) && ms.material().hasProperty(PropertyKey.FLUID); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputBusPartMachine.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputBusPartMachine.java index fb72184cb79..466d1af7ba1 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputBusPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputBusPartMachine.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.machine.feature.IDataStickInteractable; import com.gregtechceu.gtceu.api.machine.feature.IHasCircuitSlot; import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.integration.ae2.gui.widget.AEItemConfigWidget; import com.gregtechceu.gtceu.integration.ae2.slot.ExportOnlyAEItemList; import com.gregtechceu.gtceu.integration.ae2.slot.ExportOnlyAEItemSlot; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputHatchPartMachine.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputHatchPartMachine.java index 1de078d911c..02b1410a017 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputHatchPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEInputHatchPartMachine.java @@ -5,7 +5,7 @@ import com.gregtechceu.gtceu.api.machine.feature.IDataStickInteractable; import com.gregtechceu.gtceu.api.machine.feature.IHasCircuitSlot; import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.integration.ae2.gui.widget.AEFluidConfigWidget; import com.gregtechceu.gtceu.integration.ae2.slot.ExportOnlyAEFluidList; import com.gregtechceu.gtceu.integration.ae2.slot.ExportOnlyAEFluidSlot; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java index 47cef66a016..ccd6c096165 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEPatternBufferPartMachine.java @@ -22,7 +22,7 @@ import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; import com.gregtechceu.gtceu.common.data.machines.GTAEMachines; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.integration.ae2.gui.widget.AETextInputButtonWidget; import com.gregtechceu.gtceu.integration.ae2.gui.widget.slot.AEPatternViewSlotWidget; import com.gregtechceu.gtceu.integration.ae2.machine.trait.InternalSlotRecipeHandler; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingBusPartMachine.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingBusPartMachine.java index eeefbcfb52f..9079e07333b 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingBusPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingBusPartMachine.java @@ -10,7 +10,7 @@ import com.gregtechceu.gtceu.api.machine.trait.NotifiableItemStackHandler; import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField; import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.integration.ae2.machine.feature.multiblock.IMEStockingPart; import com.gregtechceu.gtceu.integration.ae2.slot.ExportOnlyAEItemList; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingHatchPartMachine.java b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingHatchPartMachine.java index 8828557d361..0cd3764e945 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingHatchPartMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/ae2/machine/MEStockingHatchPartMachine.java @@ -10,7 +10,7 @@ import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank; import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField; import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.integration.ae2.machine.feature.multiblock.IMEStockingPart; import com.gregtechceu.gtceu.integration.ae2.slot.ExportOnlyAEFluidList; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/cctweaked/CCTweakedPlugin.java b/src/main/java/com/gregtechceu/gtceu/integration/cctweaked/CCTweakedPlugin.java index 69329403884..2a258b53c2a 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/cctweaked/CCTweakedPlugin.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/cctweaked/CCTweakedPlugin.java @@ -1,6 +1,6 @@ package com.gregtechceu.gtceu.integration.cctweaked; -import com.gregtechceu.gtceu.api.capability.forge.GTCapability; +import com.gregtechceu.gtceu.api.capability.GTCapability; import com.gregtechceu.gtceu.api.placeholder.*; import com.gregtechceu.gtceu.api.placeholder.exceptions.NotSupportedException; import com.gregtechceu.gtceu.api.placeholder.exceptions.PlaceholderException; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/GTEMIPlugin.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/GTEMIPlugin.java index 187e873feac..ad042816170 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/emi/GTEMIPlugin.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/emi/GTEMIPlugin.java @@ -10,7 +10,7 @@ import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; import com.gregtechceu.gtceu.common.fluid.potion.PotionFluid; import com.gregtechceu.gtceu.common.fluid.potion.PotionFluidHelper; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.integration.emi.circuit.GTProgrammedCircuitCategory; import com.gregtechceu.gtceu.integration.emi.multipage.MultiblockInfoEmiCategory; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/emi/circuit/GTProgrammedCircuitCategory.java b/src/main/java/com/gregtechceu/gtceu/integration/emi/circuit/GTProgrammedCircuitCategory.java index 8a56d47c0fe..7f6704c3c0c 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/emi/circuit/GTProgrammedCircuitCategory.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/emi/circuit/GTProgrammedCircuitCategory.java @@ -2,7 +2,7 @@ import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.common.data.GTItems; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.integration.xei.widgets.GTProgrammedCircuitWidget; import com.lowdragmc.lowdraglib.emi.ModularEmiRecipe; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/jei/GTJEIPlugin.java b/src/main/java/com/gregtechceu/gtceu/integration/jei/GTJEIPlugin.java index 43e6a704253..ff51702ef24 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/jei/GTJEIPlugin.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/jei/GTJEIPlugin.java @@ -8,7 +8,7 @@ import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines; import com.gregtechceu.gtceu.common.fluid.potion.PotionFluid; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.integration.jei.circuit.GTProgrammedCircuitCategory; import com.gregtechceu.gtceu.integration.jei.multipage.MultiblockInfoCategory; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java b/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java index 280c5d5aba5..7704d092f7b 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/kjs/recipe/GTRecipeSchema.java @@ -21,7 +21,7 @@ import com.gregtechceu.gtceu.api.recipe.ingredient.*; import com.gregtechceu.gtceu.api.recipe.ingredient.nbtpredicate.NBTPredicate; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.gregtechceu.gtceu.common.recipe.condition.*; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.data.recipe.builder.GTRecipeBuilder; diff --git a/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTProgrammedCircuitWidget.java b/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTProgrammedCircuitWidget.java index 3846d3c0635..72404571157 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTProgrammedCircuitWidget.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/xei/widgets/GTProgrammedCircuitWidget.java @@ -3,7 +3,7 @@ import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.gui.widget.SlotWidget; import com.gregtechceu.gtceu.api.transfer.item.CustomItemStackHandler; -import com.gregtechceu.gtceu.common.item.IntCircuitBehaviour; +import com.gregtechceu.gtceu.common.item.behavior.IntCircuitBehaviour; import com.lowdragmc.lowdraglib.gui.widget.ImageWidget; import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup; diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagUtil.java b/src/main/java/com/gregtechceu/gtceu/utils/TagUtil.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/data/tag/TagUtil.java rename to src/main/java/com/gregtechceu/gtceu/utils/TagUtil.java index bd09735b024..a75159ec735 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/tag/TagUtil.java +++ b/src/main/java/com/gregtechceu/gtceu/utils/TagUtil.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.data.tag; +package com.gregtechceu.gtceu.utils; import com.gregtechceu.gtceu.GTCEu; diff --git a/src/main/java/com/gregtechceu/gtceu/api/codec/DispatchedMapCodec.java b/src/main/java/com/gregtechceu/gtceu/utils/codec/DispatchedMapCodec.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/codec/DispatchedMapCodec.java rename to src/main/java/com/gregtechceu/gtceu/utils/codec/DispatchedMapCodec.java index 7d8abeda932..cc65a071539 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/codec/DispatchedMapCodec.java +++ b/src/main/java/com/gregtechceu/gtceu/utils/codec/DispatchedMapCodec.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.codec; +package com.gregtechceu.gtceu.utils.codec; import com.gregtechceu.gtceu.GTCEu; diff --git a/src/main/java/com/gregtechceu/gtceu/api/codec/GTCodecUtils.java b/src/main/java/com/gregtechceu/gtceu/utils/codec/GTCodecUtils.java similarity index 98% rename from src/main/java/com/gregtechceu/gtceu/api/codec/GTCodecUtils.java rename to src/main/java/com/gregtechceu/gtceu/utils/codec/GTCodecUtils.java index 36577fdd3bc..b5c488489bf 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/codec/GTCodecUtils.java +++ b/src/main/java/com/gregtechceu/gtceu/utils/codec/GTCodecUtils.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.api.codec; +package com.gregtechceu.gtceu.utils.codec; import com.gregtechceu.gtceu.utils.memoization.GTMemoizer; diff --git a/src/test/java/com/gregtechceu/gtceu/gametest/util/TestUtils.java b/src/test/java/com/gregtechceu/gtceu/gametest/util/TestUtils.java index 89663238e85..6c2840a8c17 100644 --- a/src/test/java/com/gregtechceu/gtceu/gametest/util/TestUtils.java +++ b/src/test/java/com/gregtechceu/gtceu/gametest/util/TestUtils.java @@ -15,7 +15,7 @@ import com.gregtechceu.gtceu.api.placeholder.MultiLineComponent; import com.gregtechceu.gtceu.api.recipe.GTRecipeType; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.common.item.CoverPlaceBehavior; +import com.gregtechceu.gtceu.common.item.behavior.CoverPlaceBehavior; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction;