Merge remote-tracking branch 'upstream/dev' into dev

Author: BlueBoat29

src/main/java/su/terrafirmagreg/core/common/CommonProxy.java

@@ -24,16 +24,16 @@
 import su.terrafirmagreg.core.common.data.*;
 import su.terrafirmagreg.core.common.data.TFGModifyMaterials;
 import su.terrafirmagreg.core.common.data.blocks.TFGBlocks;
-import su.terrafirmagreg.core.common.entity.ai.TFGBrain;
-import su.terrafirmagreg.core.common.data.tfgt.TFGRecipeConditions;
-import su.terrafirmagreg.core.common.data.tfgt.TFGTRecipeTypes;
 import su.terrafirmagreg.core.common.data.tfgt.TFGMachines;
 import su.terrafirmagreg.core.common.data.tfgt.TFGMultiMachines;
+import su.terrafirmagreg.core.common.data.tfgt.TFGRecipeConditions;
+import su.terrafirmagreg.core.common.data.tfgt.TFGTRecipeTypes;
+import su.terrafirmagreg.core.common.entity.ai.TFGBrain;
+import su.terrafirmagreg.core.common.tfgt.material.TFGMaterialHandler;
 import su.terrafirmagreg.core.compat.ad_astra.AdAstraCompat;
 import su.terrafirmagreg.core.compat.ae2.AE2Compat;
 import su.terrafirmagreg.core.compat.create.CustomArmInteractionPointTypes;
 import su.terrafirmagreg.core.compat.grappling_hook.GrapplehookCompat;
-import su.terrafirmagreg.core.common.tfgt.materials.TFGMaterialHandler;
 import su.terrafirmagreg.core.compat.tfcambiental.TFCAmbientalCompat;
 import su.terrafirmagreg.core.config.TFGConfig;
 import su.terrafirmagreg.core.network.TFGNetworkHandler;

src/main/java/su/terrafirmagreg/core/common/ForgeCommonEventListener.java

@@ -42,8 +42,8 @@
 import su.terrafirmagreg.core.common.capability.LargeEggHandler;
 import su.terrafirmagreg.core.common.data.TFGCommands;
 import su.terrafirmagreg.core.common.data.TFGItems;
-import su.terrafirmagreg.core.common.perf.SupportCache;
 import su.terrafirmagreg.core.common.data.tfgt.TFGMultiMachines;
+import su.terrafirmagreg.core.common.perf.SupportCache;
 import su.terrafirmagreg.core.network.TFGNetworkHandler;
 import su.terrafirmagreg.core.network.packet.FuelSyncPacket;
 import su.terrafirmagreg.core.utils.CustomSpawnHelper;

src/main/java/su/terrafirmagreg/core/common/data/TFGItems.java

@@ -24,8 +24,8 @@
 
 import su.terrafirmagreg.core.TFGCore;
 import su.terrafirmagreg.core.common.data.blocks.TFGBlocks;
-import su.terrafirmagreg.core.common.item.*;
 import su.terrafirmagreg.core.common.data.tfgt.TFGCovers;
+import su.terrafirmagreg.core.common.item.*;
 import su.terrafirmagreg.core.utils.ModelUtils;
 
 @SuppressWarnings("unused")

src/main/java/su/terrafirmagreg/core/common/data/tfgt/TFGPropertyKeys.java

@@ -2,7 +2,7 @@
 
 import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey;
 
-import su.terrafirmagreg.core.common.tfgt.properties.TFCProperty;
+import su.terrafirmagreg.core.common.tfgt.material.property.TFCProperty;
 
 public final class TFGPropertyKeys {
 

src/main/java/su/terrafirmagreg/core/common/data/tfgt/TFGTagPrefix.java

@@ -9,8 +9,8 @@
 import com.gregtechceu.gtceu.api.item.tool.GTToolType;
 import com.gregtechceu.gtceu.common.data.GTMaterialItems;
 
-import su.terrafirmagreg.core.common.tfgt.materials.TFGMaterialFlags;
-import su.terrafirmagreg.core.common.tfgt.materials.TFGMaterialIconType;
+import su.terrafirmagreg.core.common.tfgt.material.TFGMaterialFlags;
+import su.terrafirmagreg.core.common.tfgt.material.TFGMaterialIconType;
 
 public final class TFGTagPrefix {
 

src/main/java/su/terrafirmagreg/core/common/tfgt/TFGTRecipes.java

@@ -20,8 +20,8 @@
 import electrolyte.greate.registry.Pumps;
 
 import su.terrafirmagreg.core.TFGCore;
-import su.terrafirmagreg.core.common.data.tfgt.TFGMachines;
 import su.terrafirmagreg.core.common.data.tfgt.TFGCraftingComponents;
+import su.terrafirmagreg.core.common.data.tfgt.TFGMachines;
 
 public class TFGTRecipes {
 

…mon/tfgt/materials/TFGMaterialFlags.java …mmon/tfgt/material/TFGMaterialFlags.javasrc/main/java/su/terrafirmagreg/core/common/tfgt/materials/TFGMaterialFlags.java renamed to src/main/java/su/terrafirmagreg/core/common/tfgt/material/TFGMaterialFlags.java src/main/java/su/terrafirmagreg/core/common/tfgt/materials/TFGMaterialFlags.java renamed to src/main/java/su/terrafirmagreg/core/common/tfgt/material/TFGMaterialFlags.java

@@ -1,4 +1,4 @@
-package su.terrafirmagreg.core.common.tfgt.materials;
+package su.terrafirmagreg.core.common.tfgt.material;
 
 import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlag;
 

…n/tfgt/materials/TFGMaterialHandler.java …on/tfgt/material/TFGMaterialHandler.javasrc/main/java/su/terrafirmagreg/core/common/tfgt/materials/TFGMaterialHandler.java renamed to src/main/java/su/terrafirmagreg/core/common/tfgt/material/TFGMaterialHandler.java src/main/java/su/terrafirmagreg/core/common/tfgt/materials/TFGMaterialHandler.java renamed to src/main/java/su/terrafirmagreg/core/common/tfgt/material/TFGMaterialHandler.java

@@ -1,4 +1,4 @@
-package su.terrafirmagreg.core.common.tfgt.materials;
+package su.terrafirmagreg.core.common.tfgt.material;
 
 import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*;
 import static com.gregtechceu.gtceu.common.data.GTMaterials.*;

…/tfgt/materials/TFGMaterialIconType.java …n/tfgt/material/TFGMaterialIconType.javasrc/main/java/su/terrafirmagreg/core/common/tfgt/materials/TFGMaterialIconType.java renamed to src/main/java/su/terrafirmagreg/core/common/tfgt/material/TFGMaterialIconType.java src/main/java/su/terrafirmagreg/core/common/tfgt/materials/TFGMaterialIconType.java renamed to src/main/java/su/terrafirmagreg/core/common/tfgt/material/TFGMaterialIconType.java

@@ -1,4 +1,4 @@
-package su.terrafirmagreg.core.common.tfgt.materials;
+package su.terrafirmagreg.core.common.tfgt.material;
 
 import com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialIconType;
 

…/common/tfgt/properties/TFCProperty.java …/tfgt/material/property/TFCProperty.javasrc/main/java/su/terrafirmagreg/core/common/tfgt/properties/TFCProperty.java renamed to src/main/java/su/terrafirmagreg/core/common/tfgt/material/property/TFCProperty.java src/main/java/su/terrafirmagreg/core/common/tfgt/properties/TFCProperty.java renamed to src/main/java/su/terrafirmagreg/core/common/tfgt/material/property/TFCProperty.java

@@ -1,4 +1,4 @@
-package su.terrafirmagreg.core.common.tfgt.properties;
+package su.terrafirmagreg.core.common.tfgt.material.property;
 
 import javax.annotation.Nullable;