rename -> uhhh

other stuffs

Author: Spicierspace153

src/main/java/com/ghostipedia/cosmiccore/CosmicCore.java

@@ -133,7 +133,7 @@ public void modifyExistingMaterials(PostMaterialEvent event) {
     @SubscribeEvent
     public void commonSetup(FMLCommonSetupEvent event) {
         event.enqueueWork(() -> {
-            TinkersMaterials.init();
+            TinkersMaterialFactory.init();
             MapIngredientTypeManager.registerMapIngredient(Integer.class, MapSoulIngredient::convertToMapIngredient);
             MapIngredientTypeManager.registerMapIngredient(Double.class, MapEmberIngredient::convertToMapIngredient);
             GridLinkables.register(CosmicItems.LINKED_TERMINAL, LinkedTerminalBehavior.handler);

src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java

@@ -1,7 +1,7 @@
 package com.ghostipedia.cosmiccore.common.data.datagen;
 
 import com.ghostipedia.cosmiccore.CosmicCore;
-import com.ghostipedia.cosmiccore.common.item.tcon.TinkersMaterials;
+import com.ghostipedia.cosmiccore.common.item.tcon.TinkersMaterialFactory;
 import com.ghostipedia.cosmiccore.common.item.tcon.modifiers.CosmicModifierProvider;
 
 import com.gregtechceu.gtceu.api.registry.registrate.SoundEntryBuilder;
@@ -24,7 +24,7 @@ public static void gatherData(GatherDataEvent event) {
 
         boolean server = event.includeServer();
         generator.addProvider(server, new CosmicModifierProvider(packOutput));
-        TinkersMaterials.init();
+        TinkersMaterialFactory.init();
         var materials = new CosmicTinkersMaterials(packOutput);
         var traits = new CosmicMaterialTraits(packOutput, materials);
         var stats = new CosmicMaterialStats(packOutput, materials);

src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java

@@ -1,25 +1,14 @@
 package com.ghostipedia.cosmiccore.common.data.datagen;
 
 import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial;
-import com.ghostipedia.cosmiccore.common.item.tcon.modifiers.CosmicCoreModifiers;
-
-import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper;
-import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
-import com.gregtechceu.gtceu.common.data.GTMaterials;
 
 import net.minecraft.data.PackOutput;
-import net.minecraft.world.item.Tiers;
-import net.minecraft.world.item.crafting.Ingredient;
 
-import slimeknights.tconstruct.library.client.data.spritetransformer.GreyToColorMapping;
 import slimeknights.tconstruct.library.data.material.AbstractMaterialDataProvider;
 import slimeknights.tconstruct.library.data.material.AbstractMaterialTraitDataProvider;
-import slimeknights.tconstruct.library.materials.MaterialRegistry;
 import slimeknights.tconstruct.library.materials.stats.MaterialStatsId;
 import slimeknights.tconstruct.library.modifiers.ModifierEntry;
 import slimeknights.tconstruct.library.modifiers.util.LazyModifier;
-import slimeknights.tconstruct.tools.TinkerModifiers;
-import slimeknights.tconstruct.tools.stats.StatlessMaterialStats;
 
 import java.util.Map;
 import java.util.Set;

src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java

@@ -23,7 +23,8 @@ public CosmicTinkersRecipeProvider(PackOutput generator) {
     @Override
     protected void buildRecipes(Consumer<FinishedRecipe> consumer) {
         for (TinkersMaterial tinkersMaterial : TinkersMaterial.MATERIALS) {
-            String folder = "tinkers/tools/material/";
+
+            String folder = "tinkers/tools/material//";
             materialRecipe(consumer, tinkersMaterial.getMaterialLocation(), tinkersMaterial.getIngredient(),
                     tinkersMaterial.getValue(), tinkersMaterial.getNeeded(), folder + tinkersMaterial.getName());
         }

src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java

@@ -5,6 +5,7 @@
 
 import lombok.Getter;
 import slimeknights.tconstruct.library.client.data.spritetransformer.IColorMapping;
+import slimeknights.tconstruct.library.materials.definition.Material;
 import slimeknights.tconstruct.library.materials.definition.MaterialId;
 import slimeknights.tconstruct.library.materials.stats.IMaterialStats;
 import slimeknights.tconstruct.library.materials.stats.MaterialStatsId;
@@ -21,6 +22,7 @@
 @Getter
 public class TinkersMaterial {
 
+    private com.gregtechceu.gtceu.api.data.chemical.material.Material material;
     public static final Set<TinkersMaterial> MATERIALS = new HashSet<>();
     private String name;
     private Set<LazyModifier> defaultTraits = new HashSet<>();
@@ -46,6 +48,8 @@ public MaterialId getMaterialLocation() {
         return new MaterialId("cosmiccore", this.name);
     }
 
+
+
     private TinkersMaterial(Builder builder) {
         this.name = builder.name;
         this.materialValue = builder.materialValue;
@@ -65,10 +69,12 @@ private TinkersMaterial(Builder builder) {
         this.ingredient = builder.ingredient;
         this.value = builder.value;
         this.needed = builder.needed;
+        this.material = builder.material;
     }
 
     public static final class Builder {
 
+        private com.gregtechceu.gtceu.api.data.chemical.material.Material material;
         private IColorMapping colorMapping;
         private boolean craftable = false;
         private int tier = 0;
@@ -166,6 +172,11 @@ public Builder defaultTrait(ModifierId modifier) {
             return this;
         }
 
+        public Builder gtMaterial(com.gregtechceu.gtceu.api.data.chemical.material.Material material) {
+            this.material = material;
+            return this;
+        }
+
         public Builder defaultTrait(Modifier modifier) {
             this.defaultTraits.add(new LazyModifier(modifier.getId()));
             return this;

…e/common/item/tcon/TinkersMaterials.java …on/item/tcon/TinkersMaterialFactory.javasrc/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java renamed to src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterialFactory.java src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java renamed to src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterialFactory.java

@@ -2,34 +2,33 @@
 
 import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial;
 import com.ghostipedia.cosmiccore.common.item.tcon.modifiers.CosmicCoreModifiers;
+
 import com.gregtechceu.gtceu.api.GTCEuAPI;
 import com.gregtechceu.gtceu.api.GTValues;
 import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper;
 import com.gregtechceu.gtceu.api.data.chemical.material.Material;
 import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey;
-import com.gregtechceu.gtceu.common.data.GTMaterials;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.Items;
+
 import net.minecraft.world.item.Tiers;
 import net.minecraft.world.item.crafting.Ingredient;
+
 import slimeknights.tconstruct.library.client.data.spritetransformer.GreyToColorMapping;
 import slimeknights.tconstruct.library.materials.MaterialRegistry;
 import slimeknights.tconstruct.library.modifiers.ModifierEntry;
 import slimeknights.tconstruct.tools.TinkerModifiers;
 import slimeknights.tconstruct.tools.stats.StatlessMaterialStats;
 
-public class TinkersMaterials {
+public class TinkersMaterialFactory {
 
     public static void init() {
-
-        for(Material material : GTCEuAPI.materialManager.getRegisteredMaterials()) {
-            if (!material.hasProperty(PropertyKey.INGOT)){
+        for (Material material : GTCEuAPI.materialManager.getRegisteredMaterials()) {
+            if (!material.hasProperty(PropertyKey.INGOT)) {
                 continue;
             }
 
-            if(material.hasProperty(PropertyKey.TOOL)){
+            if (material.hasProperty(PropertyKey.TOOL)) {
 
-                 new TinkersMaterial.Builder(material.getName())
+                new TinkersMaterial.Builder(material.getName())
                         .materialValue(2)
                         .headMaterialStats(2200, 10.0f, Tiers.IRON, 5.0f)
                         .gripMaterialStats(3000, 10.0f, 20)
@@ -38,7 +37,8 @@ public static void init() {
                         .addStatlessType(StatlessMaterialStats.REPAIR_KIT)
                         .addStatlessType(StatlessMaterialStats.BOWSTRING)
                         .defaultTrait(CosmicCoreModifiers.wrenchModeSwitch.getId())
-                        .trait(() -> new ModifierEntry(CosmicCoreModifiers.wrenchModeSwitch.get(), 3), MaterialRegistry.RANGED)
+                        .trait(() -> new ModifierEntry(CosmicCoreModifiers.wrenchModeSwitch.get(), 3),
+                                MaterialRegistry.RANGED)
                         .trait(() -> new ModifierEntry(TinkerModifiers.decay.get(), 1), MaterialRegistry.MELEE_HARVEST)
                         .sortOrder(10)
                         .craftable(true)
@@ -53,10 +53,9 @@ public static void init() {
                         .fallback("iron")
                         .color(material.getMaterialARGB())
                         .Ingredient(Ingredient.of(ChemicalHelper.getIngot(material, GTValues.M)), 1, 2)
+                        .gtMaterial(material)
                         .build();
 
-
-
             }
 
         }

src/main/java/com/ghostipedia/cosmiccore/mixin/tinkers/ToolPartItemMixin.java

@@ -2,13 +2,18 @@
 
 import com.ghostipedia.cosmiccore.api.data.material.property.CCoreMaterialIconSet;
 import com.ghostipedia.cosmiccore.client.renderer.item.CosmicCoreItemRendererProvider;
+
+import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial;
 import com.gregtechceu.gtceu.GTCEu;
+import com.gregtechceu.gtceu.api.GTCEuAPI;
 import com.gregtechceu.gtceu.api.data.chemical.material.Material;
 import com.gregtechceu.gtceu.api.item.component.ICustomRenderer;
 import com.gregtechceu.gtceu.common.data.GTMaterials;
+
 import com.lowdragmc.lowdraglib.client.renderer.IRenderer;
-import net.minecraft.world.item.Item;
+
 import net.minecraft.world.item.ItemStack;
+
 import org.checkerframework.common.aliasing.qual.Unique;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
@@ -22,6 +27,7 @@
 @Mixin(value = ToolPartItem.class, remap = false)
 public class ToolPartItemMixin extends MaterialItem implements CosmicCoreItemRendererProvider {
 
+
     @Unique
     private ICustomRenderer cosmicCore$customRenderer;
 
@@ -31,10 +37,9 @@ public ToolPartItemMixin(Properties properties) {
 
     @Inject(method = "<init>", at = @At(value = "RETURN"), remap = false)
     private void ToolPartItem(Properties properties, MaterialStatsId id, CallbackInfo ci) {
-        if(GTCEu.isClientSide()) {
-            // check the gt material from the tinker material stats
-            Material mat = GTMaterials.Neutronium;
-            if (mat.getMaterialIconSet() instanceof CCoreMaterialIconSet iconSet) {
+        if (GTCEu.isClientSide()) {
+             gtMaterial = () ->  GTCEuAPI.materialManager.getMaterial(id.toString());
+            if (gtMaterial.getMaterialIconSet() instanceof CCoreMaterialIconSet iconSet) {
                 cosmicCore$customRenderer = iconSet.getCustomRender();
             }
         }