From 61c1e767645faf8a12f0ecfa051a8befa93eadb8 Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Tue, 23 Sep 2025 23:53:14 -0600 Subject: [PATCH 01/16] step one of tinkers material builder system //todo EVERYTHING THAT I DIDNT DO --- .../data/datagen/CosmicDataGenerators.java | 6 +- .../data/datagen/CosmicMaterialTraits.java | 72 ++++++++++ .../materials/tinkers/TinkersMaterial.java | 131 ++++++++++++++++++ 3 files changed, 206 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java create mode 100644 src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java index 108d462f..0617c27f 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java @@ -27,9 +27,9 @@ public static void gatherData(GatherDataEvent event) { generator.addProvider(server, new CosmicModifierProvider(packOutput)); // TODO DATAGEN FOR Materials + stats + traits (server) - // generator.addProvider(server, new CosmicTinkersMaterials(packOutput)); - // generator.addProvider(server, new CosmicMaterialStats(packOutput)); - // generator.addProvider(server, new CosmicMaterialTraits(packOutput)); + generator.addProvider(server, new CosmicTinkersMaterials(packOutput)); + // = generator.addProvider(server, new CosmicMaterialStats(packOutput)); + generator.addProvider(server, new CosmicMaterialTraits(packOutput)); if (event.includeClient()) { generator.addProvider(true, new SoundEntryBuilder.SoundEntryProvider(packOutput, CosmicCore.MOD_ID)); diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java new file mode 100644 index 00000000..05567118 --- /dev/null +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java @@ -0,0 +1,72 @@ +package com.ghostipedia.cosmiccore.common.data.datagen; + +import com.ghostipedia.cosmiccore.CosmicCore; +import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; +import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial.Builder; +import com.ghostipedia.cosmiccore.common.item.tcon.modifiers.CosmicCoreModifiers; + +import net.minecraft.data.PackOutput; +import net.minecraft.world.item.Tier; +import net.minecraft.world.item.Tiers; + +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.Modifier; +import slimeknights.tconstruct.library.modifiers.ModifierEntry; +import slimeknights.tconstruct.library.modifiers.util.LazyModifier; +import slimeknights.tconstruct.tools.TinkerModifiers; +import slimeknights.tconstruct.tools.data.ModifierIds; +import slimeknights.tconstruct.tools.data.material.MaterialIds; +import slimeknights.tconstruct.tools.modifiers.slotless.OverslimeModifier; +import slimeknights.tconstruct.tools.stats.StatlessMaterialStats; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class CosmicMaterialTraits extends AbstractMaterialTraitDataProvider { + + public CosmicMaterialTraits(PackOutput packOutput, AbstractMaterialDataProvider materials) { + super(packOutput, materials); + } + + public static final TinkersMaterial TEST_MATERIAL = new TinkersMaterial.Builder("shiboubouya_dn_tube") + .materialValue(2) + .headMaterialStats(2200, 10.0f, Tiers.IRON, 5.0f) + .gripMaterialStats(3000, 10.0f, 20) + .handleMaterialStats(3000, 10, 4, 10) + .addStatlessType(StatlessMaterialStats.BINDING) + .addStatlessType(StatlessMaterialStats.REPAIR_KIT) + .addStatlessType(StatlessMaterialStats.BOWSTRING) + .defaultTrait(CosmicCoreModifiers.wrenchModeSwitch) + .trait(CosmicCoreModifiers.wrenchModeSwitch, 3, MaterialRegistry.RANGED) + .sortOrder(10) + .build(); + + @Override + protected void addMaterialTraits() { + for(TinkersMaterial material : TinkersMaterial.MATERIALS) { + Set defaultTraits = material.getDefaultTraits(); + if(!defaultTraits.isEmpty()){ + addDefaultTraits(material.getMaterialName(), material.getDefaultTraits().toArray(defaultTraits.toArray(new LazyModifier[0]))); + } + Map> statTraits = material.getTraits(); + if (!statTraits.isEmpty()) { + for (Map.Entry> entry : statTraits.entrySet()) { + addTraits( + material.getMaterialName(), + entry.getKey(), + entry.getValue().toArray(new ModifierEntry[0])); + } + } + + } + } + + @Override + public String getName() { + return ""; + } +} diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java new file mode 100644 index 00000000..5c85c784 --- /dev/null +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java @@ -0,0 +1,131 @@ +package com.ghostipedia.cosmiccore.common.data.materials.tinkers; + +import net.minecraft.world.item.Tier; + +import lombok.Builder; +import lombok.Getter; +import slimeknights.tconstruct.library.materials.definition.MaterialId; +import slimeknights.tconstruct.library.materials.stats.MaterialStatsId; +import slimeknights.tconstruct.library.modifiers.ModifierEntry; +import slimeknights.tconstruct.library.modifiers.util.LazyModifier; +import slimeknights.tconstruct.library.tools.stat.ToolStats; +import slimeknights.tconstruct.tools.stats.*; + +import java.util.*; + +@Getter +public class TinkersMaterial { + + public static final Set MATERIALS = new HashSet<>(); + private String name; + private Set defaultTraits = new HashSet<>(); + private Map> traits = new HashMap<>(); + private int materialValue; + private HeadMaterialStats headMaterialStats; + private HandleMaterialStats handleMaterialStats; + private GripMaterialStats gripMaterialStats; + private Set statlessMaterialStats = new HashSet<>(); + private SkullStats skullStats; + private ToolStats toolStats; + private int sortOrder; + + public MaterialId getMaterialName() { + return new MaterialId("cosmiccore", this.name); + } + + private TinkersMaterial(Builder builder) { + this.name = builder.name; + this.materialValue = builder.materialValue; + this.headMaterialStats = builder.headMaterialStats; + } + + public static final class Builder { + + private String name; + private Set modifiers = new HashSet<>(); + private int materialValue = 1; + private int sortOrder = 0; // Default to general + private HeadMaterialStats headMaterialStats; + private HandleMaterialStats handleMaterialStats; + private GripMaterialStats gripMaterialStats; + private Set statlessMaterialStats = new HashSet<>(); + private SkullStats skullStats; + private ToolStats toolStats; + private Set defaultTraits; + private Map> statSpecificTraits = new HashMap<>(); + + public Builder(String name) { + this.name = name; + } + + public Builder modifier(LazyModifier modifier) { + modifiers.add(modifier); + return this; + } + + public Builder materialValue(int materialValue) { + this.materialValue = materialValue; + return this; + } + + public Builder sortOrder(int sortOrder) { + this.sortOrder = sortOrder; + return this; + } + + public Builder headMaterialStats(int durability, float miningSpeed, Tier miningLevel, float attack) { + this.headMaterialStats = new HeadMaterialStats(durability, miningSpeed, miningLevel, attack); + return this; + } + + public Builder handleMaterialStats(float durability, float attackDamage, float attackSpeed, float miningSpeed) { + this.handleMaterialStats = new HandleMaterialStats(durability, attackDamage, attackSpeed, miningSpeed); + return this; + } + + public Builder gripMaterialStats(float durability, float attackSpeed, float meleeAttack) { + this.gripMaterialStats = new GripMaterialStats(durability, attackSpeed, meleeAttack); + return this; + } + + public Builder addStatlessType(StatlessMaterialStats type) { + this.statlessMaterialStats.add(type); + return this; + } + + public Builder toolStats(ToolStats toolStats) { + this.toolStats = toolStats; + return this; + } + + /** + * Adds a simple, level 1 trait. Corresponds to addDefaultTraits(). + * + * @param modifier The modifier to add as a default trait. + * @return The builder instance. + */ + public Builder defaultTrait(LazyModifier modifier) { + this.defaultTraits.add(modifier); + return this; + } + + /** + * Adds a trait with a specific level. Corresponds to addTraits(). + * + * @param modifier The modifier to add as a leveled trait. + * @param level The level of the modifier. + * @return The builder instance. + */ + public Builder trait(LazyModifier modifier, int level, MaterialStatsId statsId) { + List traits = this.statSpecificTraits.computeIfAbsent(statsId, k -> new ArrayList<>()); + traits.add(new ModifierEntry(modifier.get(), level)); + return this; + } + + public TinkersMaterial build() { + TinkersMaterial material = new TinkersMaterial(this); + TinkersMaterial.MATERIALS.add(material); + return material; + } + } +} From 8d778a6a4c0fe4efe6aa087814591a26af5edafc Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Wed, 24 Sep 2025 08:47:30 -0600 Subject: [PATCH 02/16] spotless this thing --- .../data/datagen/CosmicDataGenerators.java | 2 +- .../data/datagen/CosmicMaterialTraits.java | 19 ++++++------------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java index 0617c27f..4a778bfb 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java @@ -29,7 +29,7 @@ public static void gatherData(GatherDataEvent event) { // TODO DATAGEN FOR Materials + stats + traits (server) generator.addProvider(server, new CosmicTinkersMaterials(packOutput)); // = generator.addProvider(server, new CosmicMaterialStats(packOutput)); - generator.addProvider(server, new CosmicMaterialTraits(packOutput)); + // generator.addProvider(server, new CosmicMaterialTraits(packOutput, )); if (event.includeClient()) { generator.addProvider(true, new SoundEntryBuilder.SoundEntryProvider(packOutput, CosmicCore.MOD_ID)); diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java index 05567118..d064bdea 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java @@ -1,28 +1,20 @@ package com.ghostipedia.cosmiccore.common.data.datagen; -import com.ghostipedia.cosmiccore.CosmicCore; import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial.Builder; import com.ghostipedia.cosmiccore.common.item.tcon.modifiers.CosmicCoreModifiers; import net.minecraft.data.PackOutput; -import net.minecraft.world.item.Tier; import net.minecraft.world.item.Tiers; 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.Modifier; import slimeknights.tconstruct.library.modifiers.ModifierEntry; import slimeknights.tconstruct.library.modifiers.util.LazyModifier; -import slimeknights.tconstruct.tools.TinkerModifiers; -import slimeknights.tconstruct.tools.data.ModifierIds; -import slimeknights.tconstruct.tools.data.material.MaterialIds; -import slimeknights.tconstruct.tools.modifiers.slotless.OverslimeModifier; import slimeknights.tconstruct.tools.stats.StatlessMaterialStats; -import java.util.List; import java.util.Map; import java.util.Set; @@ -47,11 +39,12 @@ public CosmicMaterialTraits(PackOutput packOutput, AbstractMaterialDataProvider @Override protected void addMaterialTraits() { - for(TinkersMaterial material : TinkersMaterial.MATERIALS) { - Set defaultTraits = material.getDefaultTraits(); - if(!defaultTraits.isEmpty()){ - addDefaultTraits(material.getMaterialName(), material.getDefaultTraits().toArray(defaultTraits.toArray(new LazyModifier[0]))); - } + for (TinkersMaterial material : TinkersMaterial.MATERIALS) { + Set defaultTraits = material.getDefaultTraits(); + if (!defaultTraits.isEmpty()) { + addDefaultTraits(material.getMaterialName(), + material.getDefaultTraits().toArray(defaultTraits.toArray(new LazyModifier[0]))); + } Map> statTraits = material.getTraits(); if (!statTraits.isEmpty()) { for (Map.Entry> entry : statTraits.entrySet()) { From a79e9d7bd15fe905c8f4ddb757002513132390bc Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Wed, 24 Sep 2025 10:59:34 -0600 Subject: [PATCH 03/16] start CosmicTinkersMaterials.java --- .../data/datagen/CosmicMaterialTraits.java | 12 +++++----- .../data/datagen/CosmicTinkersMaterials.java | 7 ++++-- .../materials/tinkers/TinkersMaterial.java | 22 ++++++++++++++----- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java index d064bdea..383e9043 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java @@ -1,15 +1,12 @@ package com.ghostipedia.cosmiccore.common.data.datagen; import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; -import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial.Builder; -import com.ghostipedia.cosmiccore.common.item.tcon.modifiers.CosmicCoreModifiers; import net.minecraft.data.PackOutput; import net.minecraft.world.item.Tiers; 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; @@ -32,9 +29,10 @@ public CosmicMaterialTraits(PackOutput packOutput, AbstractMaterialDataProvider .addStatlessType(StatlessMaterialStats.BINDING) .addStatlessType(StatlessMaterialStats.REPAIR_KIT) .addStatlessType(StatlessMaterialStats.BOWSTRING) - .defaultTrait(CosmicCoreModifiers.wrenchModeSwitch) - .trait(CosmicCoreModifiers.wrenchModeSwitch, 3, MaterialRegistry.RANGED) + //.defaultTrait(CosmicCoreModifiers.wrenchModeSwitch) + //.trait(CosmicCoreModifiers.wrenchModeSwitch, 3, MaterialRegistry.RANGED) .sortOrder(10) + .craftable(true) .build(); @Override @@ -42,14 +40,14 @@ protected void addMaterialTraits() { for (TinkersMaterial material : TinkersMaterial.MATERIALS) { Set defaultTraits = material.getDefaultTraits(); if (!defaultTraits.isEmpty()) { - addDefaultTraits(material.getMaterialName(), + addDefaultTraits(material.getMaterialLocation(), material.getDefaultTraits().toArray(defaultTraits.toArray(new LazyModifier[0]))); } Map> statTraits = material.getTraits(); if (!statTraits.isEmpty()) { for (Map.Entry> entry : statTraits.entrySet()) { addTraits( - material.getMaterialName(), + material.getMaterialLocation(), entry.getKey(), entry.getValue().toArray(new ModifierEntry[0])); } diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersMaterials.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersMaterials.java index dc10c025..a9f00e20 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersMaterials.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersMaterials.java @@ -2,6 +2,7 @@ import com.ghostipedia.cosmiccore.CosmicCore; +import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; @@ -17,11 +18,13 @@ public CosmicTinkersMaterials(PackOutput out) { @Override protected void addMaterials() { - // todo figure this out + for(TinkersMaterial material : TinkersMaterial.MATERIALS ){ + addMaterial( material.getMaterialLocation(), material.getTier(), material.getSortOrder(), material.isCraftable()); + } } @Override public String getName() { - return ""; + return "Cosmic Core Materials"; } } diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java index 5c85c784..9f85a5ed 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java @@ -2,7 +2,6 @@ import net.minecraft.world.item.Tier; -import lombok.Builder; import lombok.Getter; import slimeknights.tconstruct.library.materials.definition.MaterialId; import slimeknights.tconstruct.library.materials.stats.MaterialStatsId; @@ -25,11 +24,11 @@ public class TinkersMaterial { private HandleMaterialStats handleMaterialStats; private GripMaterialStats gripMaterialStats; private Set statlessMaterialStats = new HashSet<>(); - private SkullStats skullStats; - private ToolStats toolStats; private int sortOrder; + private boolean craftable; + private int tier; - public MaterialId getMaterialName() { + public MaterialId getMaterialLocation() { return new MaterialId("cosmiccore", this.name); } @@ -40,11 +39,12 @@ private TinkersMaterial(Builder builder) { } public static final class Builder { - + private boolean craftable = false; + private int tier = 0; private String name; private Set modifiers = new HashSet<>(); private int materialValue = 1; - private int sortOrder = 0; // Default to general + private int sortOrder = 0; private HeadMaterialStats headMaterialStats; private HandleMaterialStats handleMaterialStats; private GripMaterialStats gripMaterialStats; @@ -58,6 +58,16 @@ public Builder(String name) { this.name = name; } + public Builder tier(int tier) { + this.tier = tier; + return this; + } + + public Builder craftable(boolean craftable) { + this.craftable = craftable; + return this; + } + public Builder modifier(LazyModifier modifier) { modifiers.add(modifier); return this; From 1b7e69751a498f36c5fcdbc036655023cb7bc2c7 Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Wed, 24 Sep 2025 14:51:33 -0600 Subject: [PATCH 04/16] dynamically generate tool stats now --- .../data/datagen/CosmicDataGenerators.java | 2 +- .../data/datagen/CosmicMaterialStats.java | 31 ++++++++++++ .../datagen/CosmicTinkersRecipeProvider.java | 34 ++++++++++++++ .../materials/tinkers/TinkersMaterial.java | 47 +++++++++++-------- .../item/tcon/CosmicCreativeTinkersTab.java | 4 +- 5 files changed, 95 insertions(+), 23 deletions(-) create mode 100644 src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialStats.java create mode 100644 src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java index 4a778bfb..3a464257 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java @@ -28,7 +28,7 @@ public static void gatherData(GatherDataEvent event) { // TODO DATAGEN FOR Materials + stats + traits (server) generator.addProvider(server, new CosmicTinkersMaterials(packOutput)); - // = generator.addProvider(server, new CosmicMaterialStats(packOutput)); + generator.addProvider(server, new CosmicMaterialStats(packOutput)); // generator.addProvider(server, new CosmicMaterialTraits(packOutput, )); if (event.includeClient()) { diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialStats.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialStats.java new file mode 100644 index 00000000..32e1e3ac --- /dev/null +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialStats.java @@ -0,0 +1,31 @@ +package com.ghostipedia.cosmiccore.common.data.datagen; + +import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; +import net.minecraft.data.PackOutput; +import slimeknights.tconstruct.library.data.material.AbstractMaterialDataProvider; +import slimeknights.tconstruct.library.data.material.AbstractMaterialStatsDataProvider; +import slimeknights.tconstruct.library.materials.stats.IMaterialStats; + +import java.util.List; + +public class CosmicMaterialStats extends AbstractMaterialStatsDataProvider { + public CosmicMaterialStats(PackOutput packOutput, AbstractMaterialDataProvider materials) { + super(packOutput, materials); + } + + @Override + protected void addMaterialStats() { + + for (TinkersMaterial material : TinkersMaterial.MATERIALS){ + + addMaterialStats(material.getMaterialLocation(), material.MATERIALSTATS.toArray(new IMaterialStats[0])); + + } + + } + + @Override + public String getName() { + return "cosmic MaterialStats"; + } +} diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java new file mode 100644 index 00000000..596a2c20 --- /dev/null +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java @@ -0,0 +1,34 @@ +package com.ghostipedia.cosmiccore.common.data.datagen; + +import com.ghostipedia.cosmiccore.CosmicCore; +import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; +import net.minecraft.data.PackOutput; +import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeProvider; +import net.minecraftforge.common.crafting.conditions.IConditionBuilder; +import slimeknights.mantle.recipe.data.IRecipeHelper; + + +import java.util.function.Consumer; + +public class CosmicTinkersRecipeProvider extends RecipeProvider implements IRecipeHelper, IConditionBuilder { + public CosmicTinkersRecipeProvider(PackOutput generator) { + super(generator); + } + + @Override + protected void buildRecipes(Consumer consumer) { + + for(TinkersMaterial tinkersMaterial : TinkersMaterial.MATERIALS){ + + + + } + + } + + @Override + public String getModId() { + return CosmicCore.MOD_ID; + } +} diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java index 9f85a5ed..8e76fba3 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java @@ -1,9 +1,9 @@ package com.ghostipedia.cosmiccore.common.data.materials.tinkers; import net.minecraft.world.item.Tier; - import lombok.Getter; import slimeknights.tconstruct.library.materials.definition.MaterialId; +import slimeknights.tconstruct.library.materials.stats.IMaterialStats; import slimeknights.tconstruct.library.materials.stats.MaterialStatsId; import slimeknights.tconstruct.library.modifiers.ModifierEntry; import slimeknights.tconstruct.library.modifiers.util.LazyModifier; @@ -23,7 +23,8 @@ public class TinkersMaterial { private HeadMaterialStats headMaterialStats; private HandleMaterialStats handleMaterialStats; private GripMaterialStats gripMaterialStats; - private Set statlessMaterialStats = new HashSet<>(); + private Set statlessMaterialStats; + private List allStats; private int sortOrder; private boolean craftable; private int tier; @@ -36,23 +37,37 @@ private TinkersMaterial(Builder builder) { this.name = builder.name; this.materialValue = builder.materialValue; this.headMaterialStats = builder.headMaterialStats; + this.handleMaterialStats = builder.handleMaterialStats; + this.gripMaterialStats = builder.gripMaterialStats; + this.statlessMaterialStats = builder.statlessMaterialStats; + this.sortOrder = builder.sortOrder; + this.craftable = builder.craftable; + this.tier = builder.tier; + this.allStats = builder.stats; + this.defaultTraits = builder.defaultTraits; + this.traits = new HashMap<>(); // Simplified for this example + } + + public List getAllStats() { + return this.allStats; } public static final class Builder { - private boolean craftable = false; - private int tier = 0; + private boolean craftable = false; + private int tier = 0; private String name; private Set modifiers = new HashSet<>(); private int materialValue = 1; private int sortOrder = 0; + private final List stats = new ArrayList<>(); private HeadMaterialStats headMaterialStats; private HandleMaterialStats handleMaterialStats; private GripMaterialStats gripMaterialStats; - private Set statlessMaterialStats = new HashSet<>(); + private final Set statlessMaterialStats = new HashSet<>(); private SkullStats skullStats; private ToolStats toolStats; - private Set defaultTraits; - private Map> statSpecificTraits = new HashMap<>(); + private final Set defaultTraits = new HashSet<>(); + private final Map> statSpecificTraits = new HashMap<>(); public Builder(String name) { this.name = name; @@ -85,21 +100,25 @@ public Builder sortOrder(int sortOrder) { public Builder headMaterialStats(int durability, float miningSpeed, Tier miningLevel, float attack) { this.headMaterialStats = new HeadMaterialStats(durability, miningSpeed, miningLevel, attack); + this.stats.add(this.headMaterialStats); return this; } public Builder handleMaterialStats(float durability, float attackDamage, float attackSpeed, float miningSpeed) { this.handleMaterialStats = new HandleMaterialStats(durability, attackDamage, attackSpeed, miningSpeed); + this.stats.add(this.handleMaterialStats); return this; } public Builder gripMaterialStats(float durability, float attackSpeed, float meleeAttack) { this.gripMaterialStats = new GripMaterialStats(durability, attackSpeed, meleeAttack); + this.stats.add(this.gripMaterialStats); return this; } public Builder addStatlessType(StatlessMaterialStats type) { this.statlessMaterialStats.add(type); + this.stats.add(type); return this; } @@ -108,24 +127,11 @@ public Builder toolStats(ToolStats toolStats) { return this; } - /** - * Adds a simple, level 1 trait. Corresponds to addDefaultTraits(). - * - * @param modifier The modifier to add as a default trait. - * @return The builder instance. - */ public Builder defaultTrait(LazyModifier modifier) { this.defaultTraits.add(modifier); return this; } - /** - * Adds a trait with a specific level. Corresponds to addTraits(). - * - * @param modifier The modifier to add as a leveled trait. - * @param level The level of the modifier. - * @return The builder instance. - */ public Builder trait(LazyModifier modifier, int level, MaterialStatsId statsId) { List traits = this.statSpecificTraits.computeIfAbsent(statsId, k -> new ArrayList<>()); traits.add(new ModifierEntry(modifier.get(), level)); @@ -139,3 +145,4 @@ public TinkersMaterial build() { } } } + diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/CosmicCreativeTinkersTab.java b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/CosmicCreativeTinkersTab.java index 96b5c1df..92e2bb17 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/CosmicCreativeTinkersTab.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/CosmicCreativeTinkersTab.java @@ -33,6 +33,6 @@ public static void acceptPart(Consumer output, Supplier output, EnumObject tools) { - tools.forEach(tool -> ToolBuildHandler.addVariants(output, tool, "")); + tools.forEach(tool -> ToolBuildHandler.addVariants(output, tool, "")); + } } -} From f7d9dca10546cae57deeae98bb79812848ed8849 Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Wed, 24 Sep 2025 14:52:41 -0600 Subject: [PATCH 05/16] oops no errors --- .../common/data/datagen/CosmicMaterialStats.java | 2 +- .../common/data/materials/tinkers/TinkersMaterial.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialStats.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialStats.java index 32e1e3ac..57b50ff0 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialStats.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialStats.java @@ -18,7 +18,7 @@ protected void addMaterialStats() { for (TinkersMaterial material : TinkersMaterial.MATERIALS){ - addMaterialStats(material.getMaterialLocation(), material.MATERIALSTATS.toArray(new IMaterialStats[0])); + addMaterialStats(material.getMaterialLocation(), material.getStats().toArray(new IMaterialStats[0])); } diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java index 8e76fba3..8240c5d6 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java @@ -24,7 +24,7 @@ public class TinkersMaterial { private HandleMaterialStats handleMaterialStats; private GripMaterialStats gripMaterialStats; private Set statlessMaterialStats; - private List allStats; + private List stats; private int sortOrder; private boolean craftable; private int tier; @@ -43,13 +43,13 @@ private TinkersMaterial(Builder builder) { this.sortOrder = builder.sortOrder; this.craftable = builder.craftable; this.tier = builder.tier; - this.allStats = builder.stats; + this.stats = builder.stats; this.defaultTraits = builder.defaultTraits; this.traits = new HashMap<>(); // Simplified for this example } - public List getAllStats() { - return this.allStats; + public List getStats() { + return this.stats; } public static final class Builder { From a7118f3768c188547ae4e9ecbfd7536b641789f5 Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Thu, 25 Sep 2025 21:39:26 -0600 Subject: [PATCH 06/16] HELP!!!!! --- .../data/datagen/CosmicDataGenerators.java | 17 +- .../data/datagen/CosmicMaterialStats.java | 13 +- .../data/datagen/CosmicMaterialTraits.java | 25 ++- .../data/datagen/CosmicTinkersMaterials.java | 7 +- .../datagen/CosmicTinkersRecipeProvider.java | 10 +- .../materials/tinkers/TinkersMaterial.java | 21 +- .../item/tcon/CosmicCreativeTinkersTab.java | 4 +- .../common/item/tcon/TinkersMaterials.java | 193 ++++++++++++++++++ .../modifiers/CosmicModifierProvider.java | 4 +- 9 files changed, 250 insertions(+), 44 deletions(-) create mode 100644 src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java index 3a464257..2e5cfc2e 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java @@ -1,6 +1,8 @@ package com.ghostipedia.cosmiccore.common.data.datagen; import com.ghostipedia.cosmiccore.CosmicCore; +import com.ghostipedia.cosmiccore.common.data.materials.CosmicMaterials; +import com.ghostipedia.cosmiccore.common.item.tcon.TinkersMaterials; import com.ghostipedia.cosmiccore.common.item.tcon.modifiers.CosmicModifierProvider; import com.gregtechceu.gtceu.api.registry.registrate.SoundEntryBuilder; @@ -11,6 +13,7 @@ import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import slimeknights.tconstruct.tools.data.material.MaterialDataProvider; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) public class CosmicDataGenerators { @@ -22,14 +25,20 @@ public static void gatherData(GatherDataEvent event) { ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); var registries = event.getLookupProvider(); - boolean server = event.includeServer(); + boolean server = event.includeServer(); generator.addProvider(server, new CosmicModifierProvider(packOutput)); + TinkersMaterials.init(); + var materials = new CosmicTinkersMaterials(packOutput); + var traits = new CosmicMaterialTraits(packOutput, materials); + var stats = new CosmicMaterialStats(packOutput, materials); + // TODO DATAGEN FOR Materials + stats + traits (server) - generator.addProvider(server, new CosmicTinkersMaterials(packOutput)); - generator.addProvider(server, new CosmicMaterialStats(packOutput)); - // generator.addProvider(server, new CosmicMaterialTraits(packOutput, )); + + generator.addProvider(server,materials ); + generator.addProvider(server, traits ); + generator.addProvider(server, stats ); if (event.includeClient()) { generator.addProvider(true, new SoundEntryBuilder.SoundEntryProvider(packOutput, CosmicCore.MOD_ID)); diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialStats.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialStats.java index 57b50ff0..19288910 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialStats.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialStats.java @@ -1,31 +1,28 @@ package com.ghostipedia.cosmiccore.common.data.datagen; import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; + import net.minecraft.data.PackOutput; + import slimeknights.tconstruct.library.data.material.AbstractMaterialDataProvider; import slimeknights.tconstruct.library.data.material.AbstractMaterialStatsDataProvider; import slimeknights.tconstruct.library.materials.stats.IMaterialStats; -import java.util.List; - public class CosmicMaterialStats extends AbstractMaterialStatsDataProvider { + public CosmicMaterialStats(PackOutput packOutput, AbstractMaterialDataProvider materials) { super(packOutput, materials); } @Override protected void addMaterialStats() { - - for (TinkersMaterial material : TinkersMaterial.MATERIALS){ - + for (TinkersMaterial material : TinkersMaterial.MATERIALS) { addMaterialStats(material.getMaterialLocation(), material.getStats().toArray(new IMaterialStats[0])); - } - } @Override public String getName() { - return "cosmic MaterialStats"; + return "cosmic Material Stats"; } } diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java index 383e9043..78c2b224 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java @@ -2,14 +2,18 @@ import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; +import com.ghostipedia.cosmiccore.common.item.tcon.modifiers.CosmicCoreModifiers; import net.minecraft.data.PackOutput; -import net.minecraft.world.item.Tiers; +import net.minecraft.world.item.Tiers; 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.Modifier; 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; @@ -23,22 +27,23 @@ public CosmicMaterialTraits(PackOutput packOutput, AbstractMaterialDataProvider public static final TinkersMaterial TEST_MATERIAL = new TinkersMaterial.Builder("shiboubouya_dn_tube") .materialValue(2) - .headMaterialStats(2200, 10.0f, Tiers.IRON, 5.0f) + .headMaterialStats(2200, 10.0f, Tiers.IRON, 5.0f) .gripMaterialStats(3000, 10.0f, 20) .handleMaterialStats(3000, 10, 4, 10) .addStatlessType(StatlessMaterialStats.BINDING) - .addStatlessType(StatlessMaterialStats.REPAIR_KIT) + .addStatlessType(StatlessMaterialStats.REPAIR_KIT) .addStatlessType(StatlessMaterialStats.BOWSTRING) - //.defaultTrait(CosmicCoreModifiers.wrenchModeSwitch) - //.trait(CosmicCoreModifiers.wrenchModeSwitch, 3, MaterialRegistry.RANGED) - .sortOrder(10) - .craftable(true) - .build(); + .defaultTrait(CosmicCoreModifiers.wrenchModeSwitch.get()) + .trait(CosmicCoreModifiers.wrenchModeSwitch.get(), 3, MaterialRegistry.RANGED) + .trait(TinkerModifiers.decay.get() , 1, MaterialRegistry.MELEE_HARVEST ) + .sortOrder(10) + .craftable(true) + .build(); @Override protected void addMaterialTraits() { for (TinkersMaterial material : TinkersMaterial.MATERIALS) { - Set defaultTraits = material.getDefaultTraits(); + Set defaultTraits = material.getDefaultTraits(); if (!defaultTraits.isEmpty()) { addDefaultTraits(material.getMaterialLocation(), material.getDefaultTraits().toArray(defaultTraits.toArray(new LazyModifier[0]))); @@ -58,6 +63,6 @@ protected void addMaterialTraits() { @Override public String getName() { - return ""; + return "Cosmic Material Traits "; } } diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersMaterials.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersMaterials.java index a9f00e20..edd76e50 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersMaterials.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersMaterials.java @@ -1,8 +1,8 @@ package com.ghostipedia.cosmiccore.common.data.datagen; import com.ghostipedia.cosmiccore.CosmicCore; - import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; + import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; @@ -18,8 +18,9 @@ public CosmicTinkersMaterials(PackOutput out) { @Override protected void addMaterials() { - for(TinkersMaterial material : TinkersMaterial.MATERIALS ){ - addMaterial( material.getMaterialLocation(), material.getTier(), material.getSortOrder(), material.isCraftable()); + for (TinkersMaterial material : TinkersMaterial.MATERIALS) { + addMaterial(material.getMaterialLocation(), material.getTier(), material.getSortOrder(), + material.isCraftable()); } } diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java index 596a2c20..36b2ccce 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java @@ -2,29 +2,27 @@ import com.ghostipedia.cosmiccore.CosmicCore; import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; + import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeProvider; import net.minecraftforge.common.crafting.conditions.IConditionBuilder; -import slimeknights.mantle.recipe.data.IRecipeHelper; +import slimeknights.mantle.recipe.data.IRecipeHelper; import java.util.function.Consumer; public class CosmicTinkersRecipeProvider extends RecipeProvider implements IRecipeHelper, IConditionBuilder { + public CosmicTinkersRecipeProvider(PackOutput generator) { super(generator); } @Override protected void buildRecipes(Consumer consumer) { - - for(TinkersMaterial tinkersMaterial : TinkersMaterial.MATERIALS){ - - + for (TinkersMaterial tinkersMaterial : TinkersMaterial.MATERIALS) { } - } @Override diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java index 8240c5d6..87b5a989 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java @@ -1,12 +1,13 @@ package com.ghostipedia.cosmiccore.common.data.materials.tinkers; import net.minecraft.world.item.Tier; + import lombok.Getter; import slimeknights.tconstruct.library.materials.definition.MaterialId; import slimeknights.tconstruct.library.materials.stats.IMaterialStats; import slimeknights.tconstruct.library.materials.stats.MaterialStatsId; +import slimeknights.tconstruct.library.modifiers.Modifier; import slimeknights.tconstruct.library.modifiers.ModifierEntry; -import slimeknights.tconstruct.library.modifiers.util.LazyModifier; import slimeknights.tconstruct.library.tools.stat.ToolStats; import slimeknights.tconstruct.tools.stats.*; @@ -17,7 +18,7 @@ public class TinkersMaterial { public static final Set MATERIALS = new HashSet<>(); private String name; - private Set defaultTraits = new HashSet<>(); + private Set defaultTraits = new HashSet<>(); private Map> traits = new HashMap<>(); private int materialValue; private HeadMaterialStats headMaterialStats; @@ -45,7 +46,7 @@ private TinkersMaterial(Builder builder) { this.tier = builder.tier; this.stats = builder.stats; this.defaultTraits = builder.defaultTraits; - this.traits = new HashMap<>(); // Simplified for this example + this.traits = new HashMap<>(); // Simplified for now } public List getStats() { @@ -53,10 +54,11 @@ public List getStats() { } public static final class Builder { + private boolean craftable = false; private int tier = 0; private String name; - private Set modifiers = new HashSet<>(); + private Set modifiers = new HashSet<>(); private int materialValue = 1; private int sortOrder = 0; private final List stats = new ArrayList<>(); @@ -66,7 +68,7 @@ public static final class Builder { private final Set statlessMaterialStats = new HashSet<>(); private SkullStats skullStats; private ToolStats toolStats; - private final Set defaultTraits = new HashSet<>(); + private final Set defaultTraits = new HashSet<>(); private final Map> statSpecificTraits = new HashMap<>(); public Builder(String name) { @@ -83,7 +85,7 @@ public Builder craftable(boolean craftable) { return this; } - public Builder modifier(LazyModifier modifier) { + public Builder modifier(Modifier modifier) { modifiers.add(modifier); return this; } @@ -127,14 +129,14 @@ public Builder toolStats(ToolStats toolStats) { return this; } - public Builder defaultTrait(LazyModifier modifier) { + public Builder defaultTrait(Modifier modifier) { this.defaultTraits.add(modifier); return this; } - public Builder trait(LazyModifier modifier, int level, MaterialStatsId statsId) { + public Builder trait(Modifier modifier, int level, MaterialStatsId statsId) { List traits = this.statSpecificTraits.computeIfAbsent(statsId, k -> new ArrayList<>()); - traits.add(new ModifierEntry(modifier.get(), level)); + traits.add(new ModifierEntry(modifier, level)); return this; } @@ -145,4 +147,3 @@ public TinkersMaterial build() { } } } - diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/CosmicCreativeTinkersTab.java b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/CosmicCreativeTinkersTab.java index 92e2bb17..96b5c1df 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/CosmicCreativeTinkersTab.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/CosmicCreativeTinkersTab.java @@ -33,6 +33,6 @@ public static void acceptPart(Consumer output, Supplier output, EnumObject tools) { - tools.forEach(tool -> ToolBuildHandler.addVariants(output, tool, "")); - } + tools.forEach(tool -> ToolBuildHandler.addVariants(output, tool, "")); } +} diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java new file mode 100644 index 00000000..b81dd7ba --- /dev/null +++ b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java @@ -0,0 +1,193 @@ +package com.ghostipedia.cosmiccore.common.item.tcon; + +import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; +import net.minecraft.world.item.Tiers; +import slimeknights.tconstruct.library.materials.MaterialRegistry; +import slimeknights.tconstruct.tools.TinkerModifiers; + +public class TinkersMaterials { + + + public static void init() { + new TinkersMaterial.Builder("one") + .headMaterialStats(100, 5.0f, Tiers.WOOD, 1.0f) + .craftable(true).tier(1) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("two") + .headMaterialStats(120, 5.5f, Tiers.WOOD, 1.2f) + .craftable(true).tier(1) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("three") + .headMaterialStats(140, 6.0f, Tiers.STONE, 1.4f) + .craftable(true).tier(2) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("four") + .headMaterialStats(160, 6.5f, Tiers.STONE, 1.6f) + .craftable(true).tier(2) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("five") + .headMaterialStats(180, 7.0f, Tiers.IRON, 1.8f) + .craftable(true).tier(2) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("six") + .headMaterialStats(200, 7.5f, Tiers.IRON, 2.0f) + .craftable(true).tier(2) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("seven") + .headMaterialStats(220, 8.0f, Tiers.IRON, 2.2f) + .craftable(true).tier(2) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("eight") + .headMaterialStats(240, 8.5f, Tiers.DIAMOND, 2.4f) + .craftable(true).tier(3) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("nine") + .headMaterialStats(260, 9.0f, Tiers.DIAMOND, 2.6f) + .craftable(true).tier(3) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("ten") + .headMaterialStats(280, 9.5f, Tiers.DIAMOND, 2.8f) + .craftable(true).tier(3) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("eleven") + .headMaterialStats(300, 10.0f, Tiers.NETHERITE, 3.0f) + .craftable(true).tier(4) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("twelve") + .headMaterialStats(320, 10.5f, Tiers.NETHERITE, 3.2f) + .craftable(true).tier(4) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("thirteen") + .headMaterialStats(340, 11.0f, Tiers.NETHERITE, 3.4f) + .craftable(true).tier(4) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("fourteen") + .headMaterialStats(360, 11.5f, Tiers.NETHERITE, 3.6f) + .craftable(true).tier(4) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("fifteen") + .headMaterialStats(380, 12.0f, Tiers.NETHERITE, 3.8f) + .craftable(true).tier(4) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("sixteen") + .headMaterialStats(400, 12.5f, Tiers.NETHERITE, 4.0f) + .craftable(true).tier(4) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("seventeen") + .headMaterialStats(420, 13.0f, Tiers.NETHERITE, 4.2f) + .craftable(true).tier(4) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("eighteen") + .headMaterialStats(440, 13.5f, Tiers.NETHERITE, 4.4f) + .craftable(true).tier(4) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("nineteen") + .headMaterialStats(460, 14.0f, Tiers.NETHERITE, 4.6f) + .craftable(true).tier(4) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("twenty") + .headMaterialStats(480, 14.5f, Tiers.NETHERITE, 4.8f) + .craftable(true).tier(4) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("twentyone") + .headMaterialStats(500, 15.0f, Tiers.NETHERITE, 5.0f) + .craftable(true).tier(5) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("twentytwo") + .headMaterialStats(520, 15.5f, Tiers.NETHERITE, 5.2f) + .craftable(true).tier(5) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("twentythree") + .headMaterialStats(540, 16.0f, Tiers.NETHERITE, 5.4f) + .craftable(true).tier(5) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("twentyfour") + .headMaterialStats(560, 16.5f, Tiers.NETHERITE, 5.6f) + .craftable(true).tier(5) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("twentyfive") + .headMaterialStats(580, 17.0f, Tiers.NETHERITE, 5.8f) + .craftable(true).tier(5) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("twentysix") + .headMaterialStats(600, 17.5f, Tiers.NETHERITE, 6.0f) + .craftable(true).tier(5) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("twentyseven") + .headMaterialStats(620, 18.0f, Tiers.NETHERITE, 6.2f) + .craftable(true).tier(5) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("twentyeight") + .headMaterialStats(640, 18.5f, Tiers.NETHERITE, 6.4f) + .craftable(true).tier(5) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("twentynine") + .headMaterialStats(660, 19.0f, Tiers.NETHERITE, 6.6f) + .craftable(true).tier(5) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + + new TinkersMaterial.Builder("thirty") + .headMaterialStats(680, 19.5f, Tiers.NETHERITE, 6.8f) + .craftable(true).tier(5) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .build(); + } + +} diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/modifiers/CosmicModifierProvider.java b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/modifiers/CosmicModifierProvider.java index c59bf927..4343bd56 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/modifiers/CosmicModifierProvider.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/modifiers/CosmicModifierProvider.java @@ -1,5 +1,6 @@ package com.ghostipedia.cosmiccore.common.item.tcon.modifiers; +import com.ghostipedia.cosmiccore.common.item.tcon.TinkersMaterials; import net.minecraft.data.PackOutput; import slimeknights.tconstruct.library.data.tinkering.AbstractModifierProvider; @@ -17,8 +18,9 @@ protected void addModifiers() { .levelDisplay(ModifierLevelDisplay.NO_LEVELS); } + @Override public String getName() { - return ""; + return "cosmic modifiers"; } } From 17cbc56cbebaff37f35dd501a7bbc3cf50e4a6fe Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Thu, 25 Sep 2025 21:53:25 -0600 Subject: [PATCH 07/16] FUCK THIS FUCKASS GAME HOLY SHIT --- .../java/com/ghostipedia/cosmiccore/CosmicCore.java | 1 + src/main/templates/META-INF/mods.toml | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ghostipedia/cosmiccore/CosmicCore.java b/src/main/java/com/ghostipedia/cosmiccore/CosmicCore.java index 0ebecc4d..0283737f 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/CosmicCore.java +++ b/src/main/java/com/ghostipedia/cosmiccore/CosmicCore.java @@ -81,6 +81,7 @@ public CosmicCore(FMLJavaModLoadingContext context) { } public static void init() { + ConfigHolder.init(); CosmicCreativeModeTabs.init(); CosmicBlocks.init(); diff --git a/src/main/templates/META-INF/mods.toml b/src/main/templates/META-INF/mods.toml index 9f35999d..1d731081 100644 --- a/src/main/templates/META-INF/mods.toml +++ b/src/main/templates/META-INF/mods.toml @@ -47,9 +47,9 @@ description = "${mod_description}" side="BOTH" [[dependencies.${mod_id}]] -modId = "tconstruct" -mandatory = true -embedded = true -versionRange = "[1.20.1-3.9.2.37,)" -ordering = "AFTER" -side = "BOTH" \ No newline at end of file + modId = "tconstruct" + mandatory = true + embedded = true + versionRange = "[1.20.1-3.9.2.37,)" + ordering = "AFTER" + side = "BOTH" \ No newline at end of file From b6f5a7fe3622c13ad8600e04d6cb178340289bdf Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Fri, 26 Sep 2025 13:29:08 -0600 Subject: [PATCH 08/16] test datagen PLEASE REMMBER TO DELETE --- .../cosmiccore/tinkering/materials/definition/eight.json | 6 ++++++ .../cosmiccore/tinkering/materials/definition/eighteen.json | 6 ++++++ .../cosmiccore/tinkering/materials/definition/eleven.json | 6 ++++++ .../cosmiccore/tinkering/materials/definition/fifteen.json | 6 ++++++ .../cosmiccore/tinkering/materials/definition/five.json | 6 ++++++ .../cosmiccore/tinkering/materials/definition/four.json | 6 ++++++ .../cosmiccore/tinkering/materials/definition/fourteen.json | 6 ++++++ .../cosmiccore/tinkering/materials/definition/nine.json | 6 ++++++ .../cosmiccore/tinkering/materials/definition/nineteen.json | 6 ++++++ .../data/cosmiccore/tinkering/materials/definition/one.json | 6 ++++++ .../cosmiccore/tinkering/materials/definition/seven.json | 6 ++++++ .../tinkering/materials/definition/seventeen.json | 6 ++++++ .../data/cosmiccore/tinkering/materials/definition/six.json | 6 ++++++ .../cosmiccore/tinkering/materials/definition/sixteen.json | 6 ++++++ .../data/cosmiccore/tinkering/materials/definition/ten.json | 6 ++++++ .../cosmiccore/tinkering/materials/definition/thirteen.json | 6 ++++++ .../cosmiccore/tinkering/materials/definition/thirty.json | 6 ++++++ .../cosmiccore/tinkering/materials/definition/three.json | 6 ++++++ .../cosmiccore/tinkering/materials/definition/twelve.json | 6 ++++++ .../cosmiccore/tinkering/materials/definition/twenty.json | 6 ++++++ .../tinkering/materials/definition/twentyeight.json | 6 ++++++ .../tinkering/materials/definition/twentyfive.json | 6 ++++++ .../tinkering/materials/definition/twentyfour.json | 6 ++++++ .../tinkering/materials/definition/twentynine.json | 6 ++++++ .../tinkering/materials/definition/twentyone.json | 6 ++++++ .../tinkering/materials/definition/twentyseven.json | 6 ++++++ .../tinkering/materials/definition/twentysix.json | 6 ++++++ .../tinkering/materials/definition/twentythree.json | 6 ++++++ .../tinkering/materials/definition/twentytwo.json | 6 ++++++ .../data/cosmiccore/tinkering/materials/definition/two.json | 6 ++++++ 30 files changed, 180 insertions(+) create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/eight.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/eighteen.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/eleven.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/fifteen.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/five.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/four.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/fourteen.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/nine.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/nineteen.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/one.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/seven.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/seventeen.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/six.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/sixteen.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/ten.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirteen.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirty.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/three.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twelve.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twenty.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyeight.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfive.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfour.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentynine.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyone.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyseven.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentysix.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentythree.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentytwo.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/two.json diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eight.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eight.json new file mode 100644 index 00000000..db592519 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eight.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 3 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eighteen.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eighteen.json new file mode 100644 index 00000000..d02968ea --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eighteen.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 4 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eleven.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eleven.json new file mode 100644 index 00000000..d02968ea --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eleven.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 4 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/fifteen.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/fifteen.json new file mode 100644 index 00000000..d02968ea --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/fifteen.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 4 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/five.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/five.json new file mode 100644 index 00000000..5eb554d0 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/five.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/four.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/four.json new file mode 100644 index 00000000..5eb554d0 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/four.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/fourteen.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/fourteen.json new file mode 100644 index 00000000..d02968ea --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/fourteen.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 4 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/nine.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/nine.json new file mode 100644 index 00000000..db592519 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/nine.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 3 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/nineteen.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/nineteen.json new file mode 100644 index 00000000..d02968ea --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/nineteen.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 4 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/one.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/one.json new file mode 100644 index 00000000..54c928ed --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/one.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/seven.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/seven.json new file mode 100644 index 00000000..5eb554d0 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/seven.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/seventeen.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/seventeen.json new file mode 100644 index 00000000..d02968ea --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/seventeen.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 4 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/six.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/six.json new file mode 100644 index 00000000..5eb554d0 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/six.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/sixteen.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/sixteen.json new file mode 100644 index 00000000..d02968ea --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/sixteen.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 4 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/ten.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/ten.json new file mode 100644 index 00000000..db592519 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/ten.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 3 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirteen.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirteen.json new file mode 100644 index 00000000..d02968ea --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirteen.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 4 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirty.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirty.json new file mode 100644 index 00000000..e8f3a831 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirty.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/three.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/three.json new file mode 100644 index 00000000..5eb554d0 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/three.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 2 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twelve.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twelve.json new file mode 100644 index 00000000..d02968ea --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twelve.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 4 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twenty.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twenty.json new file mode 100644 index 00000000..d02968ea --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twenty.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 4 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyeight.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyeight.json new file mode 100644 index 00000000..e8f3a831 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyeight.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfive.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfive.json new file mode 100644 index 00000000..e8f3a831 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfive.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfour.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfour.json new file mode 100644 index 00000000..e8f3a831 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfour.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentynine.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentynine.json new file mode 100644 index 00000000..e8f3a831 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentynine.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyone.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyone.json new file mode 100644 index 00000000..e8f3a831 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyone.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyseven.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyseven.json new file mode 100644 index 00000000..e8f3a831 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyseven.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentysix.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentysix.json new file mode 100644 index 00000000..e8f3a831 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentysix.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentythree.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentythree.json new file mode 100644 index 00000000..e8f3a831 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentythree.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentytwo.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentytwo.json new file mode 100644 index 00000000..e8f3a831 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentytwo.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 5 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/two.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/two.json new file mode 100644 index 00000000..54c928ed --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/two.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 0, + "tier": 1 +} \ No newline at end of file From 809c6a4a2d96d3c743e9b191963dcf0bd4837145 Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Sat, 27 Sep 2025 18:05:27 -0600 Subject: [PATCH 09/16] lets just make it clean so i can cry --- .../com/ghostipedia/cosmiccore/CosmicCore.java | 1 - .../data/datagen/CosmicDataGenerators.java | 17 +++++------------ .../data/datagen/CosmicMaterialTraits.java | 18 +++++++++--------- .../common/item/tcon/TinkersMaterials.java | 4 ++-- .../tcon/modifiers/CosmicModifierProvider.java | 2 -- 5 files changed, 16 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/ghostipedia/cosmiccore/CosmicCore.java b/src/main/java/com/ghostipedia/cosmiccore/CosmicCore.java index 0283737f..0ebecc4d 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/CosmicCore.java +++ b/src/main/java/com/ghostipedia/cosmiccore/CosmicCore.java @@ -81,7 +81,6 @@ public CosmicCore(FMLJavaModLoadingContext context) { } public static void init() { - ConfigHolder.init(); CosmicCreativeModeTabs.init(); CosmicBlocks.init(); diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java index 2e5cfc2e..518b5b30 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java @@ -1,7 +1,6 @@ package com.ghostipedia.cosmiccore.common.data.datagen; import com.ghostipedia.cosmiccore.CosmicCore; -import com.ghostipedia.cosmiccore.common.data.materials.CosmicMaterials; import com.ghostipedia.cosmiccore.common.item.tcon.TinkersMaterials; import com.ghostipedia.cosmiccore.common.item.tcon.modifiers.CosmicModifierProvider; @@ -9,11 +8,9 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; -import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import slimeknights.tconstruct.tools.data.material.MaterialDataProvider; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) public class CosmicDataGenerators { @@ -22,23 +19,19 @@ public class CosmicDataGenerators { public static void gatherData(GatherDataEvent event) { DataGenerator generator = event.getGenerator(); PackOutput packOutput = generator.getPackOutput(); - ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); - var registries = event.getLookupProvider(); - boolean server = event.includeServer(); generator.addProvider(server, new CosmicModifierProvider(packOutput)); TinkersMaterials.init(); - var materials = new CosmicTinkersMaterials(packOutput); - var traits = new CosmicMaterialTraits(packOutput, materials); + var materials = new CosmicTinkersMaterials(packOutput); + var traits = new CosmicMaterialTraits(packOutput, materials); var stats = new CosmicMaterialStats(packOutput, materials); - // TODO DATAGEN FOR Materials + stats + traits (server) - generator.addProvider(server,materials ); - generator.addProvider(server, traits ); - generator.addProvider(server, stats ); + generator.addProvider(server, materials); + generator.addProvider(server, traits); + generator.addProvider(server, stats); if (event.includeClient()) { generator.addProvider(true, new SoundEntryBuilder.SoundEntryProvider(packOutput, CosmicCore.MOD_ID)); diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java index 78c2b224..a30130ff 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java @@ -1,11 +1,11 @@ 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 net.minecraft.data.PackOutput; +import net.minecraft.data.PackOutput; import net.minecraft.world.item.Tiers; + import slimeknights.tconstruct.library.data.material.AbstractMaterialDataProvider; import slimeknights.tconstruct.library.data.material.AbstractMaterialTraitDataProvider; import slimeknights.tconstruct.library.materials.MaterialRegistry; @@ -27,18 +27,18 @@ public CosmicMaterialTraits(PackOutput packOutput, AbstractMaterialDataProvider public static final TinkersMaterial TEST_MATERIAL = new TinkersMaterial.Builder("shiboubouya_dn_tube") .materialValue(2) - .headMaterialStats(2200, 10.0f, Tiers.IRON, 5.0f) + .headMaterialStats(2200, 10.0f, Tiers.IRON, 5.0f) .gripMaterialStats(3000, 10.0f, 20) .handleMaterialStats(3000, 10, 4, 10) .addStatlessType(StatlessMaterialStats.BINDING) - .addStatlessType(StatlessMaterialStats.REPAIR_KIT) + .addStatlessType(StatlessMaterialStats.REPAIR_KIT) .addStatlessType(StatlessMaterialStats.BOWSTRING) .defaultTrait(CosmicCoreModifiers.wrenchModeSwitch.get()) - .trait(CosmicCoreModifiers.wrenchModeSwitch.get(), 3, MaterialRegistry.RANGED) - .trait(TinkerModifiers.decay.get() , 1, MaterialRegistry.MELEE_HARVEST ) - .sortOrder(10) - .craftable(true) - .build(); + .trait(CosmicCoreModifiers.wrenchModeSwitch.get(), 3, MaterialRegistry.RANGED) + .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .sortOrder(10) + .craftable(true) + .build(); @Override protected void addMaterialTraits() { diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java index b81dd7ba..82cd3eb0 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java @@ -1,13 +1,14 @@ package com.ghostipedia.cosmiccore.common.item.tcon; import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; + import net.minecraft.world.item.Tiers; + import slimeknights.tconstruct.library.materials.MaterialRegistry; import slimeknights.tconstruct.tools.TinkerModifiers; public class TinkersMaterials { - public static void init() { new TinkersMaterial.Builder("one") .headMaterialStats(100, 5.0f, Tiers.WOOD, 1.0f) @@ -189,5 +190,4 @@ public static void init() { .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) .build(); } - } diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/modifiers/CosmicModifierProvider.java b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/modifiers/CosmicModifierProvider.java index 4343bd56..897b624c 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/modifiers/CosmicModifierProvider.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/modifiers/CosmicModifierProvider.java @@ -1,6 +1,5 @@ package com.ghostipedia.cosmiccore.common.item.tcon.modifiers; -import com.ghostipedia.cosmiccore.common.item.tcon.TinkersMaterials; import net.minecraft.data.PackOutput; import slimeknights.tconstruct.library.data.tinkering.AbstractModifierProvider; @@ -18,7 +17,6 @@ protected void addModifiers() { .levelDisplay(ModifierLevelDisplay.NO_LEVELS); } - @Override public String getName() { return "cosmic modifiers"; From 6ca4b4134320b2a7de6bf376017980e85012ecf2 Mon Sep 17 00:00:00 2001 From: jurrejelle Date: Sun, 28 Sep 2025 20:34:25 +0200 Subject: [PATCH 10/16] Fix datagen --- .../materials/definition/eighteen.json | 6 ----- .../materials/definition/eleven.json | 6 ----- .../materials/definition/fifteen.json | 6 ----- .../tinkering/materials/definition/five.json | 6 ----- .../tinkering/materials/definition/four.json | 6 ----- .../materials/definition/fourteen.json | 6 ----- .../tinkering/materials/definition/nine.json | 6 ----- .../materials/definition/nineteen.json | 6 ----- .../tinkering/materials/definition/seven.json | 6 ----- .../materials/definition/seventeen.json | 6 ----- .../{eight.json => shiboubouya_dn_tube.json} | 4 +-- .../tinkering/materials/definition/six.json | 6 ----- .../materials/definition/sixteen.json | 6 ----- .../tinkering/materials/definition/ten.json | 6 ----- .../materials/definition/thirteen.json | 6 ----- .../materials/definition/thirty.json | 6 ----- .../tinkering/materials/definition/three.json | 6 ----- .../materials/definition/twelve.json | 6 ----- .../materials/definition/twenty.json | 6 ----- .../materials/definition/twentyeight.json | 6 ----- .../materials/definition/twentyfive.json | 6 ----- .../materials/definition/twentyfour.json | 6 ----- .../materials/definition/twentynine.json | 6 ----- .../materials/definition/twentyone.json | 6 ----- .../materials/definition/twentyseven.json | 6 ----- .../materials/definition/twentysix.json | 6 ----- .../materials/definition/twentythree.json | 6 ----- .../materials/definition/twentytwo.json | 6 ----- .../tinkering/materials/definition/two.json | 6 ----- .../tinkering/materials/stats/one.json | 10 +++++++ .../materials/stats/shiboubouya_dn_tube.json | 24 +++++++++++++++++ .../tinkering/materials/traits/one.json | 8 ++++++ .../materials/traits/shiboubouya_dn_tube.json | 8 ++++++ .../data/datagen/CosmicMaterialTraits.java | 16 +++++++----- .../materials/tinkers/TinkersMaterial.java | 26 ++++++++++++++----- .../common/item/tcon/TinkersMaterials.java | 8 ++++-- 36 files changed, 88 insertions(+), 184 deletions(-) delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/eighteen.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/eleven.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/fifteen.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/five.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/four.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/fourteen.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/nine.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/nineteen.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/seven.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/seventeen.json rename src/generated/resources/data/cosmiccore/tinkering/materials/definition/{eight.json => shiboubouya_dn_tube.json} (58%) delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/six.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/sixteen.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/ten.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirteen.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirty.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/three.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twelve.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twenty.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyeight.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfive.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfour.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentynine.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyone.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyseven.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentysix.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentythree.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentytwo.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/two.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/one.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/shiboubouya_dn_tube.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/one.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/shiboubouya_dn_tube.json diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eighteen.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eighteen.json deleted file mode 100644 index d02968ea..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eighteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 4 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eleven.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eleven.json deleted file mode 100644 index d02968ea..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eleven.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 4 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/fifteen.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/fifteen.json deleted file mode 100644 index d02968ea..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/fifteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 4 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/five.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/five.json deleted file mode 100644 index 5eb554d0..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/five.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 2 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/four.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/four.json deleted file mode 100644 index 5eb554d0..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/four.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 2 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/fourteen.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/fourteen.json deleted file mode 100644 index d02968ea..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/fourteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 4 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/nine.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/nine.json deleted file mode 100644 index db592519..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/nine.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 3 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/nineteen.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/nineteen.json deleted file mode 100644 index d02968ea..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/nineteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 4 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/seven.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/seven.json deleted file mode 100644 index 5eb554d0..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/seven.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 2 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/seventeen.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/seventeen.json deleted file mode 100644 index d02968ea..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/seventeen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 4 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eight.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/shiboubouya_dn_tube.json similarity index 58% rename from src/generated/resources/data/cosmiccore/tinkering/materials/definition/eight.json rename to src/generated/resources/data/cosmiccore/tinkering/materials/definition/shiboubouya_dn_tube.json index db592519..7e74f6bf 100644 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/eight.json +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/shiboubouya_dn_tube.json @@ -1,6 +1,6 @@ { "craftable": true, "hidden": false, - "sortOrder": 0, - "tier": 3 + "sortOrder": 10, + "tier": 0 } \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/six.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/six.json deleted file mode 100644 index 5eb554d0..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/six.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 2 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/sixteen.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/sixteen.json deleted file mode 100644 index d02968ea..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/sixteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 4 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/ten.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/ten.json deleted file mode 100644 index db592519..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/ten.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 3 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirteen.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirteen.json deleted file mode 100644 index d02968ea..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirteen.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 4 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirty.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirty.json deleted file mode 100644 index e8f3a831..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/thirty.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/three.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/three.json deleted file mode 100644 index 5eb554d0..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/three.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 2 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twelve.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twelve.json deleted file mode 100644 index d02968ea..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twelve.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 4 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twenty.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twenty.json deleted file mode 100644 index d02968ea..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twenty.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 4 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyeight.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyeight.json deleted file mode 100644 index e8f3a831..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyeight.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfive.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfive.json deleted file mode 100644 index e8f3a831..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfive.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfour.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfour.json deleted file mode 100644 index e8f3a831..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyfour.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentynine.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentynine.json deleted file mode 100644 index e8f3a831..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentynine.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyone.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyone.json deleted file mode 100644 index e8f3a831..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyseven.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyseven.json deleted file mode 100644 index e8f3a831..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentyseven.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentysix.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentysix.json deleted file mode 100644 index e8f3a831..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentysix.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentythree.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentythree.json deleted file mode 100644 index e8f3a831..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentythree.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentytwo.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentytwo.json deleted file mode 100644 index e8f3a831..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/twentytwo.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 5 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/two.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/two.json deleted file mode 100644 index 54c928ed..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/two.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/one.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/one.json new file mode 100644 index 00000000..a4820bc8 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/one.json @@ -0,0 +1,10 @@ +{ + "stats": { + "tconstruct:head": { + "durability": 100, + "melee_attack": 1.0, + "mining_speed": 5.0, + "mining_tier": "minecraft:wood" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/shiboubouya_dn_tube.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/shiboubouya_dn_tube.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/shiboubouya_dn_tube.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/one.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/one.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/one.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/shiboubouya_dn_tube.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/shiboubouya_dn_tube.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/shiboubouya_dn_tube.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java index a30130ff..cf7e06fe 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java @@ -6,18 +6,21 @@ import net.minecraft.data.PackOutput; import net.minecraft.world.item.Tiers; +import slimeknights.tconstruct.common.TinkerTags; 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.Modifier; import slimeknights.tconstruct.library.modifiers.ModifierEntry; +import slimeknights.tconstruct.library.modifiers.ModifierId; 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; +import java.util.function.Supplier; public class CosmicMaterialTraits extends AbstractMaterialTraitDataProvider { @@ -33,9 +36,9 @@ public CosmicMaterialTraits(PackOutput packOutput, AbstractMaterialDataProvider .addStatlessType(StatlessMaterialStats.BINDING) .addStatlessType(StatlessMaterialStats.REPAIR_KIT) .addStatlessType(StatlessMaterialStats.BOWSTRING) - .defaultTrait(CosmicCoreModifiers.wrenchModeSwitch.get()) - .trait(CosmicCoreModifiers.wrenchModeSwitch.get(), 3, MaterialRegistry.RANGED) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .defaultTrait(CosmicCoreModifiers.wrenchModeSwitch.getId()) + .trait(()->new ModifierEntry(CosmicCoreModifiers.wrenchModeSwitch.get(), 3), MaterialRegistry.RANGED) + .trait(()->new ModifierEntry(TinkerModifiers.decay.get(), 1), MaterialRegistry.MELEE_HARVEST) .sortOrder(10) .craftable(true) .build(); @@ -43,10 +46,11 @@ public CosmicMaterialTraits(PackOutput packOutput, AbstractMaterialDataProvider @Override protected void addMaterialTraits() { for (TinkersMaterial material : TinkersMaterial.MATERIALS) { - Set defaultTraits = material.getDefaultTraits(); + Set defaultTraits = material.getDefaultTraits(); if (!defaultTraits.isEmpty()) { - addDefaultTraits(material.getMaterialLocation(), - material.getDefaultTraits().toArray(defaultTraits.toArray(new LazyModifier[0]))); + for(var defaultTrait : defaultTraits){ + addDefaultTraits(material.getMaterialLocation(), defaultTrait); + } } Map> statTraits = material.getTraits(); if (!statTraits.isEmpty()) { diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java index 87b5a989..99a96f1e 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java @@ -8,23 +8,27 @@ import slimeknights.tconstruct.library.materials.stats.MaterialStatsId; import slimeknights.tconstruct.library.modifiers.Modifier; import slimeknights.tconstruct.library.modifiers.ModifierEntry; +import slimeknights.tconstruct.library.modifiers.ModifierId; +import slimeknights.tconstruct.library.modifiers.util.LazyModifier; import slimeknights.tconstruct.library.tools.stat.ToolStats; import slimeknights.tconstruct.tools.stats.*; import java.util.*; +import java.util.function.Supplier; @Getter public class TinkersMaterial { public static final Set MATERIALS = new HashSet<>(); private String name; - private Set defaultTraits = new HashSet<>(); + private Set defaultTraits = new HashSet<>(); private Map> traits = new HashMap<>(); private int materialValue; private HeadMaterialStats headMaterialStats; private HandleMaterialStats handleMaterialStats; private GripMaterialStats gripMaterialStats; private Set statlessMaterialStats; + private Map>> statSpecificTraits = new HashMap<>(); private List stats; private int sortOrder; private boolean craftable; @@ -68,8 +72,8 @@ public static final class Builder { private final Set statlessMaterialStats = new HashSet<>(); private SkullStats skullStats; private ToolStats toolStats; - private final Set defaultTraits = new HashSet<>(); - private final Map> statSpecificTraits = new HashMap<>(); + private final Set defaultTraits = new HashSet<>(); + private final Map>> statSpecificTraits = new HashMap<>(); public Builder(String name) { this.name = name; @@ -129,14 +133,24 @@ public Builder toolStats(ToolStats toolStats) { return this; } + public Builder defaultTrait(ModifierId modifier) { + this.defaultTraits.add(new LazyModifier(modifier)); + return this; + } + public Builder defaultTrait(Modifier modifier) { - this.defaultTraits.add(modifier); + this.defaultTraits.add(new LazyModifier(modifier.getId())); return this; } public Builder trait(Modifier modifier, int level, MaterialStatsId statsId) { - List traits = this.statSpecificTraits.computeIfAbsent(statsId, k -> new ArrayList<>()); - traits.add(new ModifierEntry(modifier, level)); + List> traits = this.statSpecificTraits.computeIfAbsent(statsId, k -> new ArrayList<>()); + traits.add(() -> new ModifierEntry(modifier, level)); + return this; + } + public Builder trait(Supplier modifier, MaterialStatsId statsId) { + List> traits = this.statSpecificTraits.computeIfAbsent(statsId, k -> new ArrayList<>()); + traits.add(modifier); return this; } diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java index 82cd3eb0..2aa03b7c 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java @@ -2,9 +2,11 @@ import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; +import com.ghostipedia.cosmiccore.common.item.tcon.modifiers.CosmicCoreModifiers; import net.minecraft.world.item.Tiers; import slimeknights.tconstruct.library.materials.MaterialRegistry; +import slimeknights.tconstruct.library.modifiers.ModifierEntry; import slimeknights.tconstruct.tools.TinkerModifiers; public class TinkersMaterials { @@ -13,9 +15,10 @@ public static void init() { new TinkersMaterial.Builder("one") .headMaterialStats(100, 5.0f, Tiers.WOOD, 1.0f) .craftable(true).tier(1) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + .trait( () -> new ModifierEntry(TinkerModifiers.decay.get(), 1), MaterialRegistry.MELEE_HARVEST) + .defaultTrait(CosmicCoreModifiers.wrenchModeSwitch.getId()) .build(); - + /* new TinkersMaterial.Builder("two") .headMaterialStats(120, 5.5f, Tiers.WOOD, 1.2f) .craftable(true).tier(1) @@ -189,5 +192,6 @@ public static void init() { .craftable(true).tier(5) .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) .build(); + */ } } From f1b6b3a9747a7aad9d46e88b589bb98ef3f72772 Mon Sep 17 00:00:00 2001 From: jurrejelle Date: Sun, 28 Sep 2025 20:37:37 +0200 Subject: [PATCH 11/16] Add noTrait so material at least gets registered --- .../cosmiccore/common/data/datagen/CosmicMaterialTraits.java | 1 + .../cosmiccore/common/item/tcon/TinkersMaterials.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java index cf7e06fe..2d55e569 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java @@ -46,6 +46,7 @@ public CosmicMaterialTraits(PackOutput packOutput, AbstractMaterialDataProvider @Override protected void addMaterialTraits() { for (TinkersMaterial material : TinkersMaterial.MATERIALS) { + noTraits(material.getMaterialLocation()); Set defaultTraits = material.getDefaultTraits(); if (!defaultTraits.isEmpty()) { for(var defaultTrait : defaultTraits){ diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java index 2aa03b7c..66945284 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java @@ -16,7 +16,6 @@ public static void init() { .headMaterialStats(100, 5.0f, Tiers.WOOD, 1.0f) .craftable(true).tier(1) .trait( () -> new ModifierEntry(TinkerModifiers.decay.get(), 1), MaterialRegistry.MELEE_HARVEST) - .defaultTrait(CosmicCoreModifiers.wrenchModeSwitch.getId()) .build(); /* new TinkersMaterial.Builder("two") From f2b045aded225f9dcfbf7aaee1469290204514bf Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Sun, 28 Sep 2025 16:42:11 -0600 Subject: [PATCH 12/16] i really hope i don't have to do too much more for color --- .../materials/shiboubouya_dn_tube.json | 37 +++++++++++++++++++ .../tinkering/materials/definition/one.json | 6 --- .../tinkering/materials/stats/one.json | 10 ----- .../tinkering/materials/traits/one.json | 8 ---- .../data/datagen/CosmicDataGenerators.java | 7 +++- .../CosmicMaterialRenderInfoProvider.java | 35 ++++++++++++++++++ .../datagen/CosmicMaterialSpriteProvider.java | 26 +++++++++++++ .../data/datagen/CosmicMaterialTraits.java | 12 ++++++ .../materials/tinkers/TinkersMaterial.java | 34 ++++++++++++++++- .../common/item/tcon/TinkersMaterials.java | 3 +- 10 files changed, 151 insertions(+), 27 deletions(-) create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/shiboubouya_dn_tube.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/one.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/one.json delete mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/one.json create mode 100644 src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialRenderInfoProvider.java create mode 100644 src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialSpriteProvider.java diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/shiboubouya_dn_tube.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/shiboubouya_dn_tube.json new file mode 100644 index 00000000..e74c8804 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/shiboubouya_dn_tube.json @@ -0,0 +1,37 @@ +{ + "color": "FFADD8E6", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/one.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/one.json deleted file mode 100644 index 54c928ed..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/one.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "craftable": true, - "hidden": false, - "sortOrder": 0, - "tier": 1 -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/one.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/one.json deleted file mode 100644 index a4820bc8..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/one.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "stats": { - "tconstruct:head": { - "durability": 100, - "melee_attack": 1.0, - "mining_speed": 5.0, - "mining_tier": "minecraft:wood" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/one.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/one.json deleted file mode 100644 index 71f7732a..00000000 --- a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/one.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "default": [ - { - "level": 1, - "name": "cosmiccore:wrench_switch" - } - ] -} \ No newline at end of file diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java index 518b5b30..4e5217a2 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java @@ -8,6 +8,7 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; +import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -19,6 +20,8 @@ public class CosmicDataGenerators { public static void gatherData(GatherDataEvent event) { DataGenerator generator = event.getGenerator(); PackOutput packOutput = generator.getPackOutput(); + ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); + boolean server = event.includeServer(); generator.addProvider(server, new CosmicModifierProvider(packOutput)); @@ -26,12 +29,14 @@ public static void gatherData(GatherDataEvent event) { var materials = new CosmicTinkersMaterials(packOutput); var traits = new CosmicMaterialTraits(packOutput, materials); var stats = new CosmicMaterialStats(packOutput, materials); - + var spriteProvider = new CosmicMaterialSpriteProvider(); + var renderInfoProvider = new CosmicMaterialRenderInfoProvider(packOutput, spriteProvider, existingFileHelper ); // TODO DATAGEN FOR Materials + stats + traits (server) generator.addProvider(server, materials); generator.addProvider(server, traits); generator.addProvider(server, stats); + generator.addProvider(server, renderInfoProvider); if (event.includeClient()) { generator.addProvider(true, new SoundEntryBuilder.SoundEntryProvider(packOutput, CosmicCore.MOD_ID)); diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialRenderInfoProvider.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialRenderInfoProvider.java new file mode 100644 index 00000000..738c1795 --- /dev/null +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialRenderInfoProvider.java @@ -0,0 +1,35 @@ +package com.ghostipedia.cosmiccore.common.data.datagen; + +import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; +import net.minecraft.data.PackOutput; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; +import slimeknights.tconstruct.library.client.data.material.AbstractMaterialRenderInfoProvider; +import slimeknights.tconstruct.library.client.data.material.AbstractMaterialSpriteProvider; +import slimeknights.tconstruct.library.materials.MaterialRegistry; + +public class CosmicMaterialRenderInfoProvider extends AbstractMaterialRenderInfoProvider { + + public CosmicMaterialRenderInfoProvider(PackOutput packOutput, @Nullable AbstractMaterialSpriteProvider + materialSprites, @Nullable ExistingFileHelper existingFileHelper) { + super(packOutput, materialSprites, existingFileHelper); + } + + @Override + protected void addMaterialRenderInfo() { + + for(TinkersMaterial material : TinkersMaterial.MATERIALS) { + buildRenderInfo(material.getMaterialLocation()) + .color(material.getColor()) + .fallbacks(material.getFallbacks().toArray(new String[0])); + + } + + + } + + @Override + public String getName() { + return "cosmic material render provider"; + } +} diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialSpriteProvider.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialSpriteProvider.java new file mode 100644 index 00000000..289f9707 --- /dev/null +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialSpriteProvider.java @@ -0,0 +1,26 @@ +package com.ghostipedia.cosmiccore.common.data.datagen; + +import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; +import slimeknights.tconstruct.library.client.data.material.AbstractMaterialSpriteProvider; +import slimeknights.tconstruct.library.materials.definition.IMaterial; +import slimeknights.tconstruct.tools.stats.StatlessMaterialStats; + +public class CosmicMaterialSpriteProvider extends AbstractMaterialSpriteProvider { + + @Override + public String getName() { + return ""; + } + + @Override + protected void addAllMaterials() { + + for(TinkersMaterial material : TinkersMaterial.MATERIALS){ + buildMaterial(material.getMaterialLocation()) + .colorMapper(material.getColorMapping()) + .repairKit().statType(StatlessMaterialStats.BINDING.getIdentifier()); + + } + + } +} diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java index 2d55e569..1a193963 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java @@ -7,6 +7,7 @@ import net.minecraft.world.item.Tiers; import slimeknights.tconstruct.common.TinkerTags; +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; @@ -41,6 +42,17 @@ public CosmicMaterialTraits(PackOutput packOutput, AbstractMaterialDataProvider .trait(()->new ModifierEntry(TinkerModifiers.decay.get(), 1), MaterialRegistry.MELEE_HARVEST) .sortOrder(10) .craftable(true) + .colorMapping( + GreyToColorMapping.builder() + .addARGB(0, 0xFFFF66CC) + .addARGB(85, 0xFFFF99DD) + .addARGB(170, 0xFF99CCFF) + .addARGB(255, 0xFF66CCFF) + .build() + ) + .fallback("silver") + .fallback("iron") + .color(0xFFADD8E6) .build(); @Override diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java index 99a96f1e..b8b19ea8 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java @@ -3,6 +3,7 @@ import net.minecraft.world.item.Tier; import lombok.Getter; +import slimeknights.tconstruct.library.client.data.spritetransformer.IColorMapping; import slimeknights.tconstruct.library.materials.definition.MaterialId; import slimeknights.tconstruct.library.materials.stats.IMaterialStats; import slimeknights.tconstruct.library.materials.stats.MaterialStatsId; @@ -33,6 +34,9 @@ public class TinkersMaterial { private int sortOrder; private boolean craftable; private int tier; + private IColorMapping colorMapping; + private int color; + private List fallbacks; public MaterialId getMaterialLocation() { return new MaterialId("cosmiccore", this.name); @@ -50,7 +54,10 @@ private TinkersMaterial(Builder builder) { this.tier = builder.tier; this.stats = builder.stats; this.defaultTraits = builder.defaultTraits; - this.traits = new HashMap<>(); // Simplified for now + this.colorMapping = builder.colorMapping; + this.traits = new HashMap<>(); + this.color = builder.color; + this.fallbacks = new ArrayList<>(builder.fallbacks); } public List getStats() { @@ -59,6 +66,7 @@ public List getStats() { public static final class Builder { + private IColorMapping colorMapping; private boolean craftable = false; private int tier = 0; private String name; @@ -74,6 +82,9 @@ public static final class Builder { private ToolStats toolStats; private final Set defaultTraits = new HashSet<>(); private final Map>> statSpecificTraits = new HashMap<>(); + private int color; + private final List fallbacks = new ArrayList<>(); + public Builder(String name) { this.name = name; @@ -84,6 +95,12 @@ public Builder tier(int tier) { return this; } + public Builder color (int color){ + this.color = color; + return this; + } + + public Builder craftable(boolean craftable) { this.craftable = craftable; return this; @@ -154,6 +171,21 @@ public Builder trait(Supplier modifier, MaterialStatsId statsId) return this; } + public Builder colorMapping(IColorMapping colorMapping) { + this.colorMapping = colorMapping; + return this; + } + + public Builder fallback(String fallback) { + this.fallbacks.add(fallback); + return this; + } + + public Builder fallbacks(Collection fallbacks) { + this.fallbacks.addAll(fallbacks); + return this; + } + public TinkersMaterial build() { TinkersMaterial material = new TinkersMaterial(this); TinkersMaterial.MATERIALS.add(material); diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java index 66945284..07eda8bb 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java @@ -12,12 +12,13 @@ public class TinkersMaterials { public static void init() { + /* new TinkersMaterial.Builder("one") .headMaterialStats(100, 5.0f, Tiers.WOOD, 1.0f) .craftable(true).tier(1) .trait( () -> new ModifierEntry(TinkerModifiers.decay.get(), 1), MaterialRegistry.MELEE_HARVEST) .build(); - /* + new TinkersMaterial.Builder("two") .headMaterialStats(120, 5.5f, Tiers.WOOD, 1.2f) .craftable(true).tier(1) From 67ed96386d9c3d620e28a957dc7a9e87a4f450fd Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Sun, 28 Sep 2025 17:45:41 -0600 Subject: [PATCH 13/16] //todo: cleanup? i think this is jsut about done holy shit im free --- .../tools/material/shiboubouya_dn_tube.json | 9 +++++++++ .../data/datagen/CosmicDataGenerators.java | 5 ++++- .../data/datagen/CosmicMaterialTraits.java | 4 ++++ .../datagen/CosmicTinkersRecipeProvider.java | 12 ++++++++++-- .../data/materials/tinkers/TinkersMaterial.java | 17 +++++++++++++++++ 5 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 src/generated/resources/data/cosmiccore/recipes/tools/material/shiboubouya_dn_tube.json diff --git a/src/generated/resources/data/cosmiccore/recipes/tools/material/shiboubouya_dn_tube.json b/src/generated/resources/data/cosmiccore/recipes/tools/material/shiboubouya_dn_tube.json new file mode 100644 index 00000000..8594b39c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tools/material/shiboubouya_dn_tube.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "tag": "forge:ingots/neutronium" + }, + "material": "cosmiccore:shiboubouya_dn_tube", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java index 4e5217a2..d7b054bc 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java @@ -12,6 +12,7 @@ import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import slimeknights.tconstruct.tools.data.material.MaterialRecipeProvider; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) public class CosmicDataGenerators { @@ -31,13 +32,15 @@ public static void gatherData(GatherDataEvent event) { var stats = new CosmicMaterialStats(packOutput, materials); var spriteProvider = new CosmicMaterialSpriteProvider(); var renderInfoProvider = new CosmicMaterialRenderInfoProvider(packOutput, spriteProvider, existingFileHelper ); + var materialRecipeProvider = new CosmicTinkersRecipeProvider(packOutput); + // TODO DATAGEN FOR Materials + stats + traits (server) generator.addProvider(server, materials); generator.addProvider(server, traits); generator.addProvider(server, stats); generator.addProvider(server, renderInfoProvider); - + generator.addProvider(server, materialRecipeProvider); if (event.includeClient()) { generator.addProvider(true, new SoundEntryBuilder.SoundEntryProvider(packOutput, CosmicCore.MOD_ID)); } diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java index 1a193963..1e268034 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java @@ -3,9 +3,12 @@ import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; import com.ghostipedia.cosmiccore.common.item.tcon.modifiers.CosmicCoreModifiers; +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.common.TinkerTags; import slimeknights.tconstruct.library.client.data.spritetransformer.GreyToColorMapping; import slimeknights.tconstruct.library.data.material.AbstractMaterialDataProvider; @@ -53,6 +56,7 @@ public CosmicMaterialTraits(PackOutput packOutput, AbstractMaterialDataProvider .fallback("silver") .fallback("iron") .color(0xFFADD8E6) + .Ingredient(Ingredient.of(TagPrefix.ingot.getItemTags(GTMaterials.Neutronium)[0]), 1, 2) .build(); @Override diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java index 36b2ccce..32ee1966 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java @@ -6,13 +6,19 @@ import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeProvider; +import net.minecraft.world.item.crafting.Ingredient; +import net.minecraftforge.common.Tags; import net.minecraftforge.common.crafting.conditions.IConditionBuilder; import slimeknights.mantle.recipe.data.IRecipeHelper; +import slimeknights.tconstruct.library.data.recipe.IMaterialRecipeHelper; +import slimeknights.tconstruct.tools.data.material.MaterialIds; import java.util.function.Consumer; -public class CosmicTinkersRecipeProvider extends RecipeProvider implements IRecipeHelper, IConditionBuilder { +import static slimeknights.tconstruct.library.recipe.material.MaterialRecipeBuilder.materialRecipe; + +public class CosmicTinkersRecipeProvider extends RecipeProvider implements IRecipeHelper, IMaterialRecipeHelper { public CosmicTinkersRecipeProvider(PackOutput generator) { super(generator); @@ -21,7 +27,9 @@ public CosmicTinkersRecipeProvider(PackOutput generator) { @Override protected void buildRecipes(Consumer consumer) { for (TinkersMaterial tinkersMaterial : TinkersMaterial.MATERIALS) { - + String folder = "tools/material/"; + materialRecipe(consumer, tinkersMaterial.getMaterialLocation(), tinkersMaterial.getIngredient(), + tinkersMaterial.getValue(), tinkersMaterial.getNeeded(), folder + tinkersMaterial.getName()); } } diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java index b8b19ea8..e6dfe930 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java @@ -3,6 +3,7 @@ import net.minecraft.world.item.Tier; import lombok.Getter; +import net.minecraft.world.item.crafting.Ingredient; import slimeknights.tconstruct.library.client.data.spritetransformer.IColorMapping; import slimeknights.tconstruct.library.materials.definition.MaterialId; import slimeknights.tconstruct.library.materials.stats.IMaterialStats; @@ -37,6 +38,9 @@ public class TinkersMaterial { private IColorMapping colorMapping; private int color; private List fallbacks; + private Ingredient ingredient; + private int value; + private int needed; public MaterialId getMaterialLocation() { return new MaterialId("cosmiccore", this.name); @@ -58,6 +62,9 @@ private TinkersMaterial(Builder builder) { this.traits = new HashMap<>(); this.color = builder.color; this.fallbacks = new ArrayList<>(builder.fallbacks); + this.ingredient = builder.ingredient; + this.value = builder.value; + this.needed = builder.needed; } public List getStats() { @@ -84,12 +91,22 @@ public static final class Builder { private final Map>> statSpecificTraits = new HashMap<>(); private int color; private final List fallbacks = new ArrayList<>(); + private Ingredient ingredient; + private int value; + private int needed; public Builder(String name) { this.name = name; } + public Builder Ingredient(Ingredient ingredient, int value, int needed) { + this.ingredient = ingredient; + this.value = value; + this.needed = needed; + return this; + } + public Builder tier(int tier) { this.tier = tier; return this; From 920e86700fc7486f6eba00062a439af6492a0627 Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Sun, 28 Sep 2025 17:50:06 -0600 Subject: [PATCH 14/16] tinkersSpotless --- .../data/datagen/CosmicDataGenerators.java | 4 +- .../CosmicMaterialRenderInfoProvider.java | 13 +- .../datagen/CosmicMaterialSpriteProvider.java | 6 +- .../data/datagen/CosmicMaterialTraits.java | 20 +- .../datagen/CosmicTinkersRecipeProvider.java | 8 +- .../materials/tinkers/TinkersMaterial.java | 15 +- .../common/item/tcon/TinkersMaterials.java | 369 +++++++++--------- 7 files changed, 207 insertions(+), 228 deletions(-) diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java index d7b054bc..d5a1f083 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicDataGenerators.java @@ -12,7 +12,6 @@ import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import slimeknights.tconstruct.tools.data.material.MaterialRecipeProvider; @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD) public class CosmicDataGenerators { @@ -23,7 +22,6 @@ public static void gatherData(GatherDataEvent event) { PackOutput packOutput = generator.getPackOutput(); ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); - boolean server = event.includeServer(); generator.addProvider(server, new CosmicModifierProvider(packOutput)); TinkersMaterials.init(); @@ -31,7 +29,7 @@ public static void gatherData(GatherDataEvent event) { var traits = new CosmicMaterialTraits(packOutput, materials); var stats = new CosmicMaterialStats(packOutput, materials); var spriteProvider = new CosmicMaterialSpriteProvider(); - var renderInfoProvider = new CosmicMaterialRenderInfoProvider(packOutput, spriteProvider, existingFileHelper ); + var renderInfoProvider = new CosmicMaterialRenderInfoProvider(packOutput, spriteProvider, existingFileHelper); var materialRecipeProvider = new CosmicTinkersRecipeProvider(packOutput); // TODO DATAGEN FOR Materials + stats + traits (server) diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialRenderInfoProvider.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialRenderInfoProvider.java index 738c1795..7b506f96 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialRenderInfoProvider.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialRenderInfoProvider.java @@ -1,31 +1,30 @@ package com.ghostipedia.cosmiccore.common.data.datagen; import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; + import net.minecraft.data.PackOutput; import net.minecraftforge.common.data.ExistingFileHelper; + import org.jetbrains.annotations.Nullable; import slimeknights.tconstruct.library.client.data.material.AbstractMaterialRenderInfoProvider; import slimeknights.tconstruct.library.client.data.material.AbstractMaterialSpriteProvider; -import slimeknights.tconstruct.library.materials.MaterialRegistry; public class CosmicMaterialRenderInfoProvider extends AbstractMaterialRenderInfoProvider { - public CosmicMaterialRenderInfoProvider(PackOutput packOutput, @Nullable AbstractMaterialSpriteProvider - materialSprites, @Nullable ExistingFileHelper existingFileHelper) { + public CosmicMaterialRenderInfoProvider(PackOutput packOutput, + @Nullable AbstractMaterialSpriteProvider materialSprites, + @Nullable ExistingFileHelper existingFileHelper) { super(packOutput, materialSprites, existingFileHelper); } @Override protected void addMaterialRenderInfo() { - - for(TinkersMaterial material : TinkersMaterial.MATERIALS) { + for (TinkersMaterial material : TinkersMaterial.MATERIALS) { buildRenderInfo(material.getMaterialLocation()) .color(material.getColor()) .fallbacks(material.getFallbacks().toArray(new String[0])); } - - } @Override diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialSpriteProvider.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialSpriteProvider.java index 289f9707..10ae49df 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialSpriteProvider.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialSpriteProvider.java @@ -1,8 +1,8 @@ package com.ghostipedia.cosmiccore.common.data.datagen; import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; + import slimeknights.tconstruct.library.client.data.material.AbstractMaterialSpriteProvider; -import slimeknights.tconstruct.library.materials.definition.IMaterial; import slimeknights.tconstruct.tools.stats.StatlessMaterialStats; public class CosmicMaterialSpriteProvider extends AbstractMaterialSpriteProvider { @@ -14,13 +14,11 @@ public String getName() { @Override protected void addAllMaterials() { - - for(TinkersMaterial material : TinkersMaterial.MATERIALS){ + for (TinkersMaterial material : TinkersMaterial.MATERIALS) { buildMaterial(material.getMaterialLocation()) .colorMapper(material.getColorMapping()) .repairKit().statType(StatlessMaterialStats.BINDING.getIdentifier()); } - } } diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java index 1e268034..251a58a3 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java @@ -5,26 +5,23 @@ 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.common.TinkerTags; + 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.Modifier; import slimeknights.tconstruct.library.modifiers.ModifierEntry; -import slimeknights.tconstruct.library.modifiers.ModifierId; 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; -import java.util.function.Supplier; public class CosmicMaterialTraits extends AbstractMaterialTraitDataProvider { @@ -41,18 +38,17 @@ public CosmicMaterialTraits(PackOutput packOutput, AbstractMaterialDataProvider .addStatlessType(StatlessMaterialStats.REPAIR_KIT) .addStatlessType(StatlessMaterialStats.BOWSTRING) .defaultTrait(CosmicCoreModifiers.wrenchModeSwitch.getId()) - .trait(()->new ModifierEntry(CosmicCoreModifiers.wrenchModeSwitch.get(), 3), MaterialRegistry.RANGED) - .trait(()->new ModifierEntry(TinkerModifiers.decay.get(), 1), MaterialRegistry.MELEE_HARVEST) + .trait(() -> new ModifierEntry(CosmicCoreModifiers.wrenchModeSwitch.get(), 3), MaterialRegistry.RANGED) + .trait(() -> new ModifierEntry(TinkerModifiers.decay.get(), 1), MaterialRegistry.MELEE_HARVEST) .sortOrder(10) .craftable(true) .colorMapping( GreyToColorMapping.builder() - .addARGB(0, 0xFFFF66CC) - .addARGB(85, 0xFFFF99DD) + .addARGB(0, 0xFFFF66CC) + .addARGB(85, 0xFFFF99DD) .addARGB(170, 0xFF99CCFF) .addARGB(255, 0xFF66CCFF) - .build() - ) + .build()) .fallback("silver") .fallback("iron") .color(0xFFADD8E6) @@ -65,7 +61,7 @@ protected void addMaterialTraits() { noTraits(material.getMaterialLocation()); Set defaultTraits = material.getDefaultTraits(); if (!defaultTraits.isEmpty()) { - for(var defaultTrait : defaultTraits){ + for (var defaultTrait : defaultTraits) { addDefaultTraits(material.getMaterialLocation(), defaultTrait); } } diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java index 32ee1966..f7fa394f 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java @@ -6,13 +6,9 @@ import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeProvider; -import net.minecraft.world.item.crafting.Ingredient; -import net.minecraftforge.common.Tags; -import net.minecraftforge.common.crafting.conditions.IConditionBuilder; import slimeknights.mantle.recipe.data.IRecipeHelper; import slimeknights.tconstruct.library.data.recipe.IMaterialRecipeHelper; -import slimeknights.tconstruct.tools.data.material.MaterialIds; import java.util.function.Consumer; @@ -28,8 +24,8 @@ public CosmicTinkersRecipeProvider(PackOutput generator) { protected void buildRecipes(Consumer consumer) { for (TinkersMaterial tinkersMaterial : TinkersMaterial.MATERIALS) { String folder = "tools/material/"; - materialRecipe(consumer, tinkersMaterial.getMaterialLocation(), tinkersMaterial.getIngredient(), - tinkersMaterial.getValue(), tinkersMaterial.getNeeded(), folder + tinkersMaterial.getName()); + materialRecipe(consumer, tinkersMaterial.getMaterialLocation(), tinkersMaterial.getIngredient(), + tinkersMaterial.getValue(), tinkersMaterial.getNeeded(), folder + tinkersMaterial.getName()); } } diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java index e6dfe930..43accf78 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java @@ -1,9 +1,9 @@ package com.ghostipedia.cosmiccore.common.data.materials.tinkers; import net.minecraft.world.item.Tier; +import net.minecraft.world.item.crafting.Ingredient; import lombok.Getter; -import net.minecraft.world.item.crafting.Ingredient; import slimeknights.tconstruct.library.client.data.spritetransformer.IColorMapping; import slimeknights.tconstruct.library.materials.definition.MaterialId; import slimeknights.tconstruct.library.materials.stats.IMaterialStats; @@ -37,7 +37,7 @@ public class TinkersMaterial { private int tier; private IColorMapping colorMapping; private int color; - private List fallbacks; + private List fallbacks; private Ingredient ingredient; private int value; private int needed; @@ -95,7 +95,6 @@ public static final class Builder { private int value; private int needed; - public Builder(String name) { this.name = name; } @@ -112,12 +111,11 @@ public Builder tier(int tier) { return this; } - public Builder color (int color){ + public Builder color(int color) { this.color = color; return this; } - public Builder craftable(boolean craftable) { this.craftable = craftable; return this; @@ -178,12 +176,15 @@ public Builder defaultTrait(Modifier modifier) { } public Builder trait(Modifier modifier, int level, MaterialStatsId statsId) { - List> traits = this.statSpecificTraits.computeIfAbsent(statsId, k -> new ArrayList<>()); + List> traits = this.statSpecificTraits.computeIfAbsent(statsId, + k -> new ArrayList<>()); traits.add(() -> new ModifierEntry(modifier, level)); return this; } + public Builder trait(Supplier modifier, MaterialStatsId statsId) { - List> traits = this.statSpecificTraits.computeIfAbsent(statsId, k -> new ArrayList<>()); + List> traits = this.statSpecificTraits.computeIfAbsent(statsId, + k -> new ArrayList<>()); traits.add(modifier); return this; } diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java index 07eda8bb..a2d6aa8c 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java @@ -1,197 +1,188 @@ package com.ghostipedia.cosmiccore.common.item.tcon; -import com.ghostipedia.cosmiccore.common.data.materials.tinkers.TinkersMaterial; - -import com.ghostipedia.cosmiccore.common.item.tcon.modifiers.CosmicCoreModifiers; -import net.minecraft.world.item.Tiers; - -import slimeknights.tconstruct.library.materials.MaterialRegistry; -import slimeknights.tconstruct.library.modifiers.ModifierEntry; -import slimeknights.tconstruct.tools.TinkerModifiers; - public class TinkersMaterials { public static void init() { - /* - new TinkersMaterial.Builder("one") - .headMaterialStats(100, 5.0f, Tiers.WOOD, 1.0f) - .craftable(true).tier(1) - .trait( () -> new ModifierEntry(TinkerModifiers.decay.get(), 1), MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("two") - .headMaterialStats(120, 5.5f, Tiers.WOOD, 1.2f) - .craftable(true).tier(1) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("three") - .headMaterialStats(140, 6.0f, Tiers.STONE, 1.4f) - .craftable(true).tier(2) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("four") - .headMaterialStats(160, 6.5f, Tiers.STONE, 1.6f) - .craftable(true).tier(2) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("five") - .headMaterialStats(180, 7.0f, Tiers.IRON, 1.8f) - .craftable(true).tier(2) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("six") - .headMaterialStats(200, 7.5f, Tiers.IRON, 2.0f) - .craftable(true).tier(2) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("seven") - .headMaterialStats(220, 8.0f, Tiers.IRON, 2.2f) - .craftable(true).tier(2) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("eight") - .headMaterialStats(240, 8.5f, Tiers.DIAMOND, 2.4f) - .craftable(true).tier(3) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("nine") - .headMaterialStats(260, 9.0f, Tiers.DIAMOND, 2.6f) - .craftable(true).tier(3) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("ten") - .headMaterialStats(280, 9.5f, Tiers.DIAMOND, 2.8f) - .craftable(true).tier(3) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("eleven") - .headMaterialStats(300, 10.0f, Tiers.NETHERITE, 3.0f) - .craftable(true).tier(4) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("twelve") - .headMaterialStats(320, 10.5f, Tiers.NETHERITE, 3.2f) - .craftable(true).tier(4) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("thirteen") - .headMaterialStats(340, 11.0f, Tiers.NETHERITE, 3.4f) - .craftable(true).tier(4) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("fourteen") - .headMaterialStats(360, 11.5f, Tiers.NETHERITE, 3.6f) - .craftable(true).tier(4) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("fifteen") - .headMaterialStats(380, 12.0f, Tiers.NETHERITE, 3.8f) - .craftable(true).tier(4) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("sixteen") - .headMaterialStats(400, 12.5f, Tiers.NETHERITE, 4.0f) - .craftable(true).tier(4) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("seventeen") - .headMaterialStats(420, 13.0f, Tiers.NETHERITE, 4.2f) - .craftable(true).tier(4) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("eighteen") - .headMaterialStats(440, 13.5f, Tiers.NETHERITE, 4.4f) - .craftable(true).tier(4) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("nineteen") - .headMaterialStats(460, 14.0f, Tiers.NETHERITE, 4.6f) - .craftable(true).tier(4) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("twenty") - .headMaterialStats(480, 14.5f, Tiers.NETHERITE, 4.8f) - .craftable(true).tier(4) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("twentyone") - .headMaterialStats(500, 15.0f, Tiers.NETHERITE, 5.0f) - .craftable(true).tier(5) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("twentytwo") - .headMaterialStats(520, 15.5f, Tiers.NETHERITE, 5.2f) - .craftable(true).tier(5) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("twentythree") - .headMaterialStats(540, 16.0f, Tiers.NETHERITE, 5.4f) - .craftable(true).tier(5) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("twentyfour") - .headMaterialStats(560, 16.5f, Tiers.NETHERITE, 5.6f) - .craftable(true).tier(5) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("twentyfive") - .headMaterialStats(580, 17.0f, Tiers.NETHERITE, 5.8f) - .craftable(true).tier(5) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("twentysix") - .headMaterialStats(600, 17.5f, Tiers.NETHERITE, 6.0f) - .craftable(true).tier(5) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("twentyseven") - .headMaterialStats(620, 18.0f, Tiers.NETHERITE, 6.2f) - .craftable(true).tier(5) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("twentyeight") - .headMaterialStats(640, 18.5f, Tiers.NETHERITE, 6.4f) - .craftable(true).tier(5) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("twentynine") - .headMaterialStats(660, 19.0f, Tiers.NETHERITE, 6.6f) - .craftable(true).tier(5) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); - - new TinkersMaterial.Builder("thirty") - .headMaterialStats(680, 19.5f, Tiers.NETHERITE, 6.8f) - .craftable(true).tier(5) - .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - .build(); + /* + * new TinkersMaterial.Builder("one") + * .headMaterialStats(100, 5.0f, Tiers.WOOD, 1.0f) + * .craftable(true).tier(1) + * .trait( () -> new ModifierEntry(TinkerModifiers.decay.get(), 1), MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("two") + * .headMaterialStats(120, 5.5f, Tiers.WOOD, 1.2f) + * .craftable(true).tier(1) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("three") + * .headMaterialStats(140, 6.0f, Tiers.STONE, 1.4f) + * .craftable(true).tier(2) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("four") + * .headMaterialStats(160, 6.5f, Tiers.STONE, 1.6f) + * .craftable(true).tier(2) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("five") + * .headMaterialStats(180, 7.0f, Tiers.IRON, 1.8f) + * .craftable(true).tier(2) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("six") + * .headMaterialStats(200, 7.5f, Tiers.IRON, 2.0f) + * .craftable(true).tier(2) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("seven") + * .headMaterialStats(220, 8.0f, Tiers.IRON, 2.2f) + * .craftable(true).tier(2) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("eight") + * .headMaterialStats(240, 8.5f, Tiers.DIAMOND, 2.4f) + * .craftable(true).tier(3) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("nine") + * .headMaterialStats(260, 9.0f, Tiers.DIAMOND, 2.6f) + * .craftable(true).tier(3) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("ten") + * .headMaterialStats(280, 9.5f, Tiers.DIAMOND, 2.8f) + * .craftable(true).tier(3) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("eleven") + * .headMaterialStats(300, 10.0f, Tiers.NETHERITE, 3.0f) + * .craftable(true).tier(4) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("twelve") + * .headMaterialStats(320, 10.5f, Tiers.NETHERITE, 3.2f) + * .craftable(true).tier(4) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("thirteen") + * .headMaterialStats(340, 11.0f, Tiers.NETHERITE, 3.4f) + * .craftable(true).tier(4) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("fourteen") + * .headMaterialStats(360, 11.5f, Tiers.NETHERITE, 3.6f) + * .craftable(true).tier(4) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("fifteen") + * .headMaterialStats(380, 12.0f, Tiers.NETHERITE, 3.8f) + * .craftable(true).tier(4) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("sixteen") + * .headMaterialStats(400, 12.5f, Tiers.NETHERITE, 4.0f) + * .craftable(true).tier(4) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("seventeen") + * .headMaterialStats(420, 13.0f, Tiers.NETHERITE, 4.2f) + * .craftable(true).tier(4) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("eighteen") + * .headMaterialStats(440, 13.5f, Tiers.NETHERITE, 4.4f) + * .craftable(true).tier(4) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("nineteen") + * .headMaterialStats(460, 14.0f, Tiers.NETHERITE, 4.6f) + * .craftable(true).tier(4) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("twenty") + * .headMaterialStats(480, 14.5f, Tiers.NETHERITE, 4.8f) + * .craftable(true).tier(4) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("twentyone") + * .headMaterialStats(500, 15.0f, Tiers.NETHERITE, 5.0f) + * .craftable(true).tier(5) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("twentytwo") + * .headMaterialStats(520, 15.5f, Tiers.NETHERITE, 5.2f) + * .craftable(true).tier(5) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("twentythree") + * .headMaterialStats(540, 16.0f, Tiers.NETHERITE, 5.4f) + * .craftable(true).tier(5) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("twentyfour") + * .headMaterialStats(560, 16.5f, Tiers.NETHERITE, 5.6f) + * .craftable(true).tier(5) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("twentyfive") + * .headMaterialStats(580, 17.0f, Tiers.NETHERITE, 5.8f) + * .craftable(true).tier(5) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("twentysix") + * .headMaterialStats(600, 17.5f, Tiers.NETHERITE, 6.0f) + * .craftable(true).tier(5) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("twentyseven") + * .headMaterialStats(620, 18.0f, Tiers.NETHERITE, 6.2f) + * .craftable(true).tier(5) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("twentyeight") + * .headMaterialStats(640, 18.5f, Tiers.NETHERITE, 6.4f) + * .craftable(true).tier(5) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("twentynine") + * .headMaterialStats(660, 19.0f, Tiers.NETHERITE, 6.6f) + * .craftable(true).tier(5) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); + * + * new TinkersMaterial.Builder("thirty") + * .headMaterialStats(680, 19.5f, Tiers.NETHERITE, 6.8f) + * .craftable(true).tier(5) + * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) + * .build(); */ } } From fd964872ec699ac8b16a4f3891b13a5ece5ff64c Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Sun, 28 Sep 2025 17:57:51 -0600 Subject: [PATCH 15/16] BETTER MATERIAL --- .../cosmiccore/common/data/datagen/CosmicMaterialTraits.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java index 251a58a3..edc34057 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java @@ -3,6 +3,7 @@ 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; @@ -29,7 +30,7 @@ public CosmicMaterialTraits(PackOutput packOutput, AbstractMaterialDataProvider super(packOutput, materials); } - public static final TinkersMaterial TEST_MATERIAL = new TinkersMaterial.Builder("shiboubouya_dn_tube") + public static final TinkersMaterial TEST_MATERIAL = new TinkersMaterial.Builder("shiboubouya_dn_tube") .materialValue(2) .headMaterialStats(2200, 10.0f, Tiers.IRON, 5.0f) .gripMaterialStats(3000, 10.0f, 20) @@ -52,7 +53,7 @@ public CosmicMaterialTraits(PackOutput packOutput, AbstractMaterialDataProvider .fallback("silver") .fallback("iron") .color(0xFFADD8E6) - .Ingredient(Ingredient.of(TagPrefix.ingot.getItemTags(GTMaterials.Neutronium)[0]), 1, 2) + .Ingredient(Ingredient.of(ChemicalHelper.getIngot(GTMaterials.Neutronium, 1)), 1, 2) .build(); @Override From c338d7ad5d15a4fbe86d644a595542efbdb96f6b Mon Sep 17 00:00:00 2001 From: Spicierspace153 <21964509+Spicierspace153@users.noreply.github.com> Date: Sun, 28 Sep 2025 20:37:44 -0600 Subject: [PATCH 16/16] every tool prop now has tinkers. todo/ make this not shit (also lang) --- ...hiboubouya_dn_tube.json => aluminium.json} | 2 +- .../tinkering/materials/blue_steel.json | 37 +++ .../tinkering/materials/bronze.json | 37 +++ .../tinkering/materials/cobalt_brass.json | 37 +++ .../tinkering/materials/damascus_steel.json | 37 +++ .../tinkering/materials/duranium.json | 37 +++ .../cosmiccore/tinkering/materials/hsse.json | 37 +++ .../cosmiccore/tinkering/materials/invar.json | 37 +++ .../cosmiccore/tinkering/materials/iron.json | 37 +++ .../tinkering/materials/naquadah_alloy.json | 37 +++ .../tinkering/materials/netherite.json | 37 +++ .../tinkering/materials/neutronite.json | 36 +++ .../tinkering/materials/neutronium.json | 36 +++ .../materials/polybenzimidazole.json | 37 +++ .../tinkering/materials/polyethylene.json | 37 +++ .../materials/polytetrafluoroethylene.json | 37 +++ .../tinkering/materials/red_steel.json | 37 +++ .../tinkering/materials/rose_gold.json | 37 +++ .../tinkering/materials/rubber.json | 37 +++ .../tinkering/materials/silicone_rubber.json | 37 +++ .../tinkering/materials/stainless_steel.json | 37 +++ .../cosmiccore/tinkering/materials/steel.json | 37 +++ .../tinkering/materials/sterling_silver.json | 37 +++ .../materials/styrene_butadiene_rubber.json | 37 +++ .../tinkering/materials/titanium.json | 37 +++ .../tinkering/materials/trinavine.json | 37 +++ .../tinkering/materials/tungsten_carbide.json | 37 +++ .../tinkering/materials/tungsten_steel.json | 37 +++ .../tinkering/materials/ultimet.json | 37 +++ .../tinkering/materials/vanadium_steel.json | 37 +++ .../tinkering/materials/wrought_iron.json | 37 +++ .../tools/material/aluminium.json} | 4 +- .../tinkers/tools/material/blue_steel.json | 9 + .../tinkers/tools/material/bronze.json | 9 + .../tinkers/tools/material/cobalt_brass.json | 9 + .../tools/material/damascus_steel.json | 9 + .../tinkers/tools/material/duranium.json | 9 + .../recipes/tinkers/tools/material/hsse.json | 9 + .../recipes/tinkers/tools/material/invar.json | 9 + .../recipes/tinkers/tools/material/iron.json | 9 + .../tools/material/naquadah_alloy.json | 9 + .../tinkers/tools/material/netherite.json | 9 + .../tinkers/tools/material/neutronite.json | 9 + .../tinkers/tools/material/neutronium.json | 9 + .../tools/material/polybenzimidazole.json | 9 + .../tinkers/tools/material/polyethylene.json | 9 + .../material/polytetrafluoroethylene.json | 9 + .../tinkers/tools/material/red_steel.json | 9 + .../tinkers/tools/material/rose_gold.json | 9 + .../tinkers/tools/material/rubber.json | 9 + .../tools/material/silicone_rubber.json | 9 + .../tools/material/stainless_steel.json | 9 + .../recipes/tinkers/tools/material/steel.json | 9 + .../tools/material/sterling_silver.json | 9 + .../material/styrene_butadiene_rubber.json | 9 + .../tinkers/tools/material/titanium.json | 9 + .../tinkers/tools/material/trinavine.json | 9 + .../tools/material/tungsten_carbide.json | 9 + .../tools/material/tungsten_steel.json | 9 + .../tinkers/tools/material/ultimet.json | 9 + .../tools/material/vanadium_steel.json | 9 + .../tinkers/tools/material/wrought_iron.json | 9 + ...hiboubouya_dn_tube.json => aluminium.json} | 0 .../materials/definition/blue_steel.json | 6 + .../materials/definition/bronze.json | 6 + .../materials/definition/cobalt_brass.json | 6 + .../materials/definition/damascus_steel.json | 6 + .../materials/definition/duranium.json | 6 + .../tinkering/materials/definition/hsse.json | 6 + .../tinkering/materials/definition/invar.json | 6 + .../tinkering/materials/definition/iron.json | 6 + .../materials/definition/naquadah_alloy.json | 6 + .../materials/definition/netherite.json | 6 + .../materials/definition/neutronite.json | 6 + .../materials/definition/neutronium.json | 6 + .../definition/polybenzimidazole.json | 6 + .../materials/definition/polyethylene.json | 6 + .../definition/polytetrafluoroethylene.json | 6 + .../materials/definition/red_steel.json | 6 + .../materials/definition/rose_gold.json | 6 + .../materials/definition/rubber.json | 6 + .../materials/definition/silicone_rubber.json | 6 + .../materials/definition/stainless_steel.json | 6 + .../tinkering/materials/definition/steel.json | 6 + .../materials/definition/sterling_silver.json | 6 + .../definition/styrene_butadiene_rubber.json | 6 + .../materials/definition/titanium.json | 6 + .../materials/definition/trinavine.json | 6 + .../definition/tungsten_carbide.json | 6 + .../materials/definition/tungsten_steel.json | 6 + .../materials/definition/ultimet.json | 6 + .../materials/definition/vanadium_steel.json | 6 + .../materials/definition/wrought_iron.json | 6 + ...hiboubouya_dn_tube.json => aluminium.json} | 0 .../tinkering/materials/stats/blue_steel.json | 24 ++ .../tinkering/materials/stats/bronze.json | 24 ++ .../materials/stats/cobalt_brass.json | 24 ++ .../materials/stats/damascus_steel.json | 24 ++ .../tinkering/materials/stats/duranium.json | 24 ++ .../tinkering/materials/stats/hsse.json | 24 ++ .../tinkering/materials/stats/invar.json | 24 ++ .../tinkering/materials/stats/iron.json | 24 ++ .../materials/stats/naquadah_alloy.json | 24 ++ .../tinkering/materials/stats/netherite.json | 24 ++ .../tinkering/materials/stats/neutronite.json | 24 ++ .../tinkering/materials/stats/neutronium.json | 24 ++ .../materials/stats/polybenzimidazole.json | 24 ++ .../materials/stats/polyethylene.json | 24 ++ .../stats/polytetrafluoroethylene.json | 24 ++ .../tinkering/materials/stats/red_steel.json | 24 ++ .../tinkering/materials/stats/rose_gold.json | 24 ++ .../tinkering/materials/stats/rubber.json | 24 ++ .../materials/stats/silicone_rubber.json | 24 ++ .../materials/stats/stainless_steel.json | 24 ++ .../tinkering/materials/stats/steel.json | 24 ++ .../materials/stats/sterling_silver.json | 24 ++ .../stats/styrene_butadiene_rubber.json | 24 ++ .../tinkering/materials/stats/titanium.json | 24 ++ .../tinkering/materials/stats/trinavine.json | 24 ++ .../materials/stats/tungsten_carbide.json | 24 ++ .../materials/stats/tungsten_steel.json | 24 ++ .../tinkering/materials/stats/ultimet.json | 24 ++ .../materials/stats/vanadium_steel.json | 24 ++ .../materials/stats/wrought_iron.json | 24 ++ ...hiboubouya_dn_tube.json => aluminium.json} | 0 .../materials/traits/blue_steel.json | 8 + .../tinkering/materials/traits/bronze.json | 8 + .../materials/traits/cobalt_brass.json | 8 + .../materials/traits/damascus_steel.json | 8 + .../tinkering/materials/traits/duranium.json | 8 + .../tinkering/materials/traits/hsse.json | 8 + .../tinkering/materials/traits/invar.json | 8 + .../tinkering/materials/traits/iron.json | 8 + .../materials/traits/naquadah_alloy.json | 8 + .../tinkering/materials/traits/netherite.json | 8 + .../materials/traits/neutronite.json | 8 + .../materials/traits/neutronium.json | 8 + .../materials/traits/polybenzimidazole.json | 8 + .../materials/traits/polyethylene.json | 8 + .../traits/polytetrafluoroethylene.json | 8 + .../tinkering/materials/traits/red_steel.json | 8 + .../tinkering/materials/traits/rose_gold.json | 8 + .../tinkering/materials/traits/rubber.json | 8 + .../materials/traits/silicone_rubber.json | 8 + .../materials/traits/stainless_steel.json | 8 + .../tinkering/materials/traits/steel.json | 8 + .../materials/traits/sterling_silver.json | 8 + .../traits/styrene_butadiene_rubber.json | 8 + .../tinkering/materials/traits/titanium.json | 8 + .../tinkering/materials/traits/trinavine.json | 8 + .../materials/traits/tungsten_carbide.json | 8 + .../materials/traits/tungsten_steel.json | 8 + .../tinkering/materials/traits/ultimet.json | 8 + .../materials/traits/vanadium_steel.json | 8 + .../materials/traits/wrought_iron.json | 8 + .../ghostipedia/cosmiccore/CosmicCore.java | 1 + .../data/datagen/CosmicMaterialTraits.java | 26 -- .../datagen/CosmicTinkersRecipeProvider.java | 2 +- .../materials/tinkers/TinkersMaterial.java | 4 - .../common/item/tcon/TinkersMaterials.java | 238 +++++------------- 160 files changed, 2580 insertions(+), 215 deletions(-) rename src/generated/resources/assets/cosmiccore/tinkering/materials/{shiboubouya_dn_tube.json => aluminium.json} (96%) create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/blue_steel.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/bronze.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/cobalt_brass.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/damascus_steel.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/duranium.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/hsse.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/invar.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/iron.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/naquadah_alloy.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/netherite.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/neutronite.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/neutronium.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/polybenzimidazole.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/polyethylene.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/polytetrafluoroethylene.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/red_steel.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/rose_gold.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/rubber.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/silicone_rubber.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/stainless_steel.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/steel.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/sterling_silver.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/styrene_butadiene_rubber.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/titanium.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/trinavine.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/tungsten_carbide.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/tungsten_steel.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/ultimet.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/vanadium_steel.json create mode 100644 src/generated/resources/assets/cosmiccore/tinkering/materials/wrought_iron.json rename src/generated/resources/data/cosmiccore/recipes/{tools/material/shiboubouya_dn_tube.json => tinkers/tools/material/aluminium.json} (50%) create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/blue_steel.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/bronze.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/cobalt_brass.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/damascus_steel.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/duranium.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/hsse.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/invar.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/iron.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/naquadah_alloy.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/netherite.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/neutronite.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/neutronium.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/polybenzimidazole.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/polyethylene.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/polytetrafluoroethylene.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/red_steel.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/rose_gold.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/rubber.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/silicone_rubber.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/stainless_steel.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/steel.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/sterling_silver.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/styrene_butadiene_rubber.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/titanium.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/trinavine.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/tungsten_carbide.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/tungsten_steel.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/ultimet.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/vanadium_steel.json create mode 100644 src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/wrought_iron.json rename src/generated/resources/data/cosmiccore/tinkering/materials/definition/{shiboubouya_dn_tube.json => aluminium.json} (100%) create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/blue_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/bronze.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/cobalt_brass.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/damascus_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/duranium.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/hsse.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/invar.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/iron.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/naquadah_alloy.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/netherite.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/neutronite.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/neutronium.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/polybenzimidazole.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/polyethylene.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/polytetrafluoroethylene.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/red_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/rose_gold.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/rubber.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/silicone_rubber.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/stainless_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/sterling_silver.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/styrene_butadiene_rubber.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/titanium.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/trinavine.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/tungsten_carbide.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/tungsten_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/ultimet.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/vanadium_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/definition/wrought_iron.json rename src/generated/resources/data/cosmiccore/tinkering/materials/stats/{shiboubouya_dn_tube.json => aluminium.json} (100%) create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/blue_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/bronze.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/cobalt_brass.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/damascus_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/duranium.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/hsse.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/invar.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/iron.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/naquadah_alloy.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/netherite.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/neutronite.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/neutronium.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/polybenzimidazole.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/polyethylene.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/polytetrafluoroethylene.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/red_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/rose_gold.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/rubber.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/silicone_rubber.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/stainless_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/sterling_silver.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/styrene_butadiene_rubber.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/titanium.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/trinavine.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/tungsten_carbide.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/tungsten_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/ultimet.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/vanadium_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/stats/wrought_iron.json rename src/generated/resources/data/cosmiccore/tinkering/materials/traits/{shiboubouya_dn_tube.json => aluminium.json} (100%) create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/blue_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/bronze.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/cobalt_brass.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/damascus_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/duranium.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/hsse.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/invar.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/iron.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/naquadah_alloy.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/netherite.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/neutronite.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/neutronium.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/polybenzimidazole.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/polyethylene.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/polytetrafluoroethylene.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/red_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/rose_gold.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/rubber.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/silicone_rubber.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/stainless_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/sterling_silver.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/styrene_butadiene_rubber.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/titanium.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/trinavine.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/tungsten_carbide.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/tungsten_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/ultimet.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/vanadium_steel.json create mode 100644 src/generated/resources/data/cosmiccore/tinkering/materials/traits/wrought_iron.json diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/shiboubouya_dn_tube.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/aluminium.json similarity index 96% rename from src/generated/resources/assets/cosmiccore/tinkering/materials/shiboubouya_dn_tube.json rename to src/generated/resources/assets/cosmiccore/tinkering/materials/aluminium.json index e74c8804..1905c4db 100644 --- a/src/generated/resources/assets/cosmiccore/tinkering/materials/shiboubouya_dn_tube.json +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/aluminium.json @@ -1,5 +1,5 @@ { - "color": "FFADD8E6", + "color": "FF7DB9D8", "fallbacks": [ "silver", "iron" diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/blue_steel.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/blue_steel.json new file mode 100644 index 00000000..c6f6e5f1 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/blue_steel.json @@ -0,0 +1,37 @@ +{ + "color": "FF779AC6", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/bronze.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/bronze.json new file mode 100644 index 00000000..294abfb6 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/bronze.json @@ -0,0 +1,37 @@ +{ + "color": "FFFFC370", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/cobalt_brass.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/cobalt_brass.json new file mode 100644 index 00000000..b1d125b5 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/cobalt_brass.json @@ -0,0 +1,37 @@ +{ + "color": "FFBAA365", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/damascus_steel.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/damascus_steel.json new file mode 100644 index 00000000..a5742b0e --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/damascus_steel.json @@ -0,0 +1,37 @@ +{ + "color": "FF6E6E6E", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/duranium.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/duranium.json new file mode 100644 index 00000000..8a11cef0 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/duranium.json @@ -0,0 +1,37 @@ +{ + "color": "FFF3E7A9", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/hsse.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/hsse.json new file mode 100644 index 00000000..398a232a --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/hsse.json @@ -0,0 +1,37 @@ +{ + "color": "FF9D9CBE", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/invar.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/invar.json new file mode 100644 index 00000000..6e6166c5 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/invar.json @@ -0,0 +1,37 @@ +{ + "color": "FFE2E8E1", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/iron.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/iron.json new file mode 100644 index 00000000..3f311188 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/iron.json @@ -0,0 +1,37 @@ +{ + "color": "FFEEEEEE", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/naquadah_alloy.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/naquadah_alloy.json new file mode 100644 index 00000000..e7437aa1 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/naquadah_alloy.json @@ -0,0 +1,37 @@ +{ + "color": "FF323232", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/netherite.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/netherite.json new file mode 100644 index 00000000..9fc83948 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/netherite.json @@ -0,0 +1,37 @@ +{ + "color": "FF4B4042", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/neutronite.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/neutronite.json new file mode 100644 index 00000000..1b1fb5c1 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/neutronite.json @@ -0,0 +1,36 @@ +{ + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/neutronium.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/neutronium.json new file mode 100644 index 00000000..1b1fb5c1 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/neutronium.json @@ -0,0 +1,36 @@ +{ + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/polybenzimidazole.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/polybenzimidazole.json new file mode 100644 index 00000000..33521440 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/polybenzimidazole.json @@ -0,0 +1,37 @@ +{ + "color": "FF464441", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/polyethylene.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/polyethylene.json new file mode 100644 index 00000000..5b8385f9 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/polyethylene.json @@ -0,0 +1,37 @@ +{ + "color": "FFC8C8C8", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/polytetrafluoroethylene.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/polytetrafluoroethylene.json new file mode 100644 index 00000000..a5742b0e --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/polytetrafluoroethylene.json @@ -0,0 +1,37 @@ +{ + "color": "FF6E6E6E", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/red_steel.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/red_steel.json new file mode 100644 index 00000000..4bea3e38 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/red_steel.json @@ -0,0 +1,37 @@ +{ + "color": "FFA09191", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/rose_gold.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/rose_gold.json new file mode 100644 index 00000000..5cded3c8 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/rose_gold.json @@ -0,0 +1,37 @@ +{ + "color": "FFECD5B8", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/rubber.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/rubber.json new file mode 100644 index 00000000..e7374eb8 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/rubber.json @@ -0,0 +1,37 @@ +{ + "color": "FF353529", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/silicone_rubber.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/silicone_rubber.json new file mode 100644 index 00000000..ae4901b3 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/silicone_rubber.json @@ -0,0 +1,37 @@ +{ + "color": "FFF0F0F0", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/stainless_steel.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/stainless_steel.json new file mode 100644 index 00000000..631e1e6d --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/stainless_steel.json @@ -0,0 +1,37 @@ +{ + "color": "FFEDEDFD", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/steel.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/steel.json new file mode 100644 index 00000000..439476b6 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/steel.json @@ -0,0 +1,37 @@ +{ + "color": "FFA7A7A7", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/sterling_silver.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/sterling_silver.json new file mode 100644 index 00000000..d5bae89a --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/sterling_silver.json @@ -0,0 +1,37 @@ +{ + "color": "FFFAF4DC", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/styrene_butadiene_rubber.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/styrene_butadiene_rubber.json new file mode 100644 index 00000000..39da6638 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/styrene_butadiene_rubber.json @@ -0,0 +1,37 @@ +{ + "color": "FF34312B", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/titanium.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/titanium.json new file mode 100644 index 00000000..70193914 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/titanium.json @@ -0,0 +1,37 @@ +{ + "color": "FFED8EEA", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/trinavine.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/trinavine.json new file mode 100644 index 00000000..b62d589e --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/trinavine.json @@ -0,0 +1,37 @@ +{ + "color": "FFFE2D2D", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/tungsten_carbide.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/tungsten_carbide.json new file mode 100644 index 00000000..7086e686 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/tungsten_carbide.json @@ -0,0 +1,37 @@ +{ + "color": "FF635480", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/tungsten_steel.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/tungsten_steel.json new file mode 100644 index 00000000..a415a340 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/tungsten_steel.json @@ -0,0 +1,37 @@ +{ + "color": "FF687ECE", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/ultimet.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/ultimet.json new file mode 100644 index 00000000..92eb1639 --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/ultimet.json @@ -0,0 +1,37 @@ +{ + "color": "FF9F9FB1", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/vanadium_steel.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/vanadium_steel.json new file mode 100644 index 00000000..faeec0df --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/vanadium_steel.json @@ -0,0 +1,37 @@ +{ + "color": "FFB59FCC", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/cosmiccore/tinkering/materials/wrought_iron.json b/src/generated/resources/assets/cosmiccore/tinkering/materials/wrought_iron.json new file mode 100644 index 00000000..4090546a --- /dev/null +++ b/src/generated/resources/assets/cosmiccore/tinkering/materials/wrought_iron.json @@ -0,0 +1,37 @@ +{ + "color": "FFBCBCBC", + "fallbacks": [ + "silver", + "iron" + ], + "generator": { + "supported_stats": [ + "tconstruct:repair_kit", + "tconstruct:binding" + ], + "transformer": { + "type": "tconstruct:recolor_sprite", + "color_mapping": { + "type": "tconstruct:grey_to_color", + "palette": [ + { + "color": "FFFF66CC", + "grey": 0 + }, + { + "color": "FFFF99DD", + "grey": 85 + }, + { + "color": "FF99CCFF", + "grey": 170 + }, + { + "color": "FF66CCFF", + "grey": 255 + } + ] + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tools/material/shiboubouya_dn_tube.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/aluminium.json similarity index 50% rename from src/generated/resources/data/cosmiccore/recipes/tools/material/shiboubouya_dn_tube.json rename to src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/aluminium.json index 8594b39c..18ab9ab8 100644 --- a/src/generated/resources/data/cosmiccore/recipes/tools/material/shiboubouya_dn_tube.json +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/aluminium.json @@ -1,9 +1,9 @@ { "type": "tconstruct:material", "ingredient": { - "tag": "forge:ingots/neutronium" + "item": "gtceu:aluminium_ingot" }, - "material": "cosmiccore:shiboubouya_dn_tube", + "material": "cosmiccore:aluminium", "needed": 2, "value": 1 } \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/blue_steel.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/blue_steel.json new file mode 100644 index 00000000..ffc91334 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/blue_steel.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:blue_steel_ingot" + }, + "material": "cosmiccore:blue_steel", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/bronze.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/bronze.json new file mode 100644 index 00000000..656e9af3 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/bronze.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:bronze_ingot" + }, + "material": "cosmiccore:bronze", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/cobalt_brass.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/cobalt_brass.json new file mode 100644 index 00000000..80f39bd5 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/cobalt_brass.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:cobalt_brass_ingot" + }, + "material": "cosmiccore:cobalt_brass", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/damascus_steel.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/damascus_steel.json new file mode 100644 index 00000000..b56162e3 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/damascus_steel.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:damascus_steel_ingot" + }, + "material": "cosmiccore:damascus_steel", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/duranium.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/duranium.json new file mode 100644 index 00000000..699f71f9 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/duranium.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:duranium_ingot" + }, + "material": "cosmiccore:duranium", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/hsse.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/hsse.json new file mode 100644 index 00000000..9030f54a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/hsse.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:hsse_ingot" + }, + "material": "cosmiccore:hsse", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/invar.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/invar.json new file mode 100644 index 00000000..3c140043 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/invar.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:invar_ingot" + }, + "material": "cosmiccore:invar", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/iron.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/iron.json new file mode 100644 index 00000000..86fced9b --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/iron.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "minecraft:iron_ingot" + }, + "material": "cosmiccore:iron", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/naquadah_alloy.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/naquadah_alloy.json new file mode 100644 index 00000000..f880356e --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/naquadah_alloy.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:naquadah_alloy_ingot" + }, + "material": "cosmiccore:naquadah_alloy", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/netherite.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/netherite.json new file mode 100644 index 00000000..f4dda558 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/netherite.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "minecraft:netherite_ingot" + }, + "material": "cosmiccore:netherite", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/neutronite.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/neutronite.json new file mode 100644 index 00000000..78a58228 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/neutronite.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "cosmiccore:neutronite_ingot" + }, + "material": "cosmiccore:neutronite", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/neutronium.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/neutronium.json new file mode 100644 index 00000000..798b6ebc --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/neutronium.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:neutronium_ingot" + }, + "material": "cosmiccore:neutronium", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/polybenzimidazole.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/polybenzimidazole.json new file mode 100644 index 00000000..61285e4d --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/polybenzimidazole.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:polybenzimidazole_ingot" + }, + "material": "cosmiccore:polybenzimidazole", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/polyethylene.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/polyethylene.json new file mode 100644 index 00000000..57462143 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/polyethylene.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:polyethylene_ingot" + }, + "material": "cosmiccore:polyethylene", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/polytetrafluoroethylene.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/polytetrafluoroethylene.json new file mode 100644 index 00000000..5a4a8b3e --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/polytetrafluoroethylene.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:polytetrafluoroethylene_ingot" + }, + "material": "cosmiccore:polytetrafluoroethylene", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/red_steel.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/red_steel.json new file mode 100644 index 00000000..ab70000f --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/red_steel.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:red_steel_ingot" + }, + "material": "cosmiccore:red_steel", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/rose_gold.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/rose_gold.json new file mode 100644 index 00000000..e470ac08 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/rose_gold.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:rose_gold_ingot" + }, + "material": "cosmiccore:rose_gold", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/rubber.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/rubber.json new file mode 100644 index 00000000..e081d3ac --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/rubber.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:rubber_ingot" + }, + "material": "cosmiccore:rubber", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/silicone_rubber.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/silicone_rubber.json new file mode 100644 index 00000000..55c7bcce --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/silicone_rubber.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:silicone_rubber_ingot" + }, + "material": "cosmiccore:silicone_rubber", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/stainless_steel.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/stainless_steel.json new file mode 100644 index 00000000..5926e60d --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/stainless_steel.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:stainless_steel_ingot" + }, + "material": "cosmiccore:stainless_steel", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/steel.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/steel.json new file mode 100644 index 00000000..6f422443 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/steel.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:steel_ingot" + }, + "material": "cosmiccore:steel", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/sterling_silver.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/sterling_silver.json new file mode 100644 index 00000000..d6297a38 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/sterling_silver.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:sterling_silver_ingot" + }, + "material": "cosmiccore:sterling_silver", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/styrene_butadiene_rubber.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/styrene_butadiene_rubber.json new file mode 100644 index 00000000..eac6d2b0 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/styrene_butadiene_rubber.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:styrene_butadiene_rubber_ingot" + }, + "material": "cosmiccore:styrene_butadiene_rubber", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/titanium.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/titanium.json new file mode 100644 index 00000000..4d524e6c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/titanium.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:titanium_ingot" + }, + "material": "cosmiccore:titanium", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/trinavine.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/trinavine.json new file mode 100644 index 00000000..592e63d1 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/trinavine.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "cosmiccore:trinavine_ingot" + }, + "material": "cosmiccore:trinavine", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/tungsten_carbide.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/tungsten_carbide.json new file mode 100644 index 00000000..f494d531 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/tungsten_carbide.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:tungsten_carbide_ingot" + }, + "material": "cosmiccore:tungsten_carbide", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/tungsten_steel.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/tungsten_steel.json new file mode 100644 index 00000000..be0674d9 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/tungsten_steel.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:tungsten_steel_ingot" + }, + "material": "cosmiccore:tungsten_steel", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/ultimet.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/ultimet.json new file mode 100644 index 00000000..b52bf559 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/ultimet.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:ultimet_ingot" + }, + "material": "cosmiccore:ultimet", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/vanadium_steel.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/vanadium_steel.json new file mode 100644 index 00000000..292fd264 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/vanadium_steel.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:vanadium_steel_ingot" + }, + "material": "cosmiccore:vanadium_steel", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/wrought_iron.json b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/wrought_iron.json new file mode 100644 index 00000000..fe727db8 --- /dev/null +++ b/src/generated/resources/data/cosmiccore/recipes/tinkers/tools/material/wrought_iron.json @@ -0,0 +1,9 @@ +{ + "type": "tconstruct:material", + "ingredient": { + "item": "gtceu:wrought_iron_ingot" + }, + "material": "cosmiccore:wrought_iron", + "needed": 2, + "value": 1 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/shiboubouya_dn_tube.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/aluminium.json similarity index 100% rename from src/generated/resources/data/cosmiccore/tinkering/materials/definition/shiboubouya_dn_tube.json rename to src/generated/resources/data/cosmiccore/tinkering/materials/definition/aluminium.json diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/blue_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/blue_steel.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/blue_steel.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/bronze.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/bronze.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/bronze.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/cobalt_brass.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/cobalt_brass.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/cobalt_brass.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/damascus_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/damascus_steel.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/damascus_steel.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/duranium.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/duranium.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/duranium.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/hsse.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/hsse.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/hsse.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/invar.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/invar.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/invar.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/iron.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/iron.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/iron.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/naquadah_alloy.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/naquadah_alloy.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/naquadah_alloy.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/netherite.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/netherite.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/netherite.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/neutronite.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/neutronite.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/neutronite.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/neutronium.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/neutronium.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/neutronium.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/polybenzimidazole.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/polybenzimidazole.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/polybenzimidazole.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/polyethylene.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/polyethylene.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/polyethylene.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/polytetrafluoroethylene.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/polytetrafluoroethylene.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/polytetrafluoroethylene.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/red_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/red_steel.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/red_steel.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/rose_gold.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/rose_gold.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/rose_gold.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/rubber.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/rubber.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/rubber.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/silicone_rubber.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/silicone_rubber.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/silicone_rubber.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/stainless_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/stainless_steel.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/stainless_steel.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/steel.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/steel.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/sterling_silver.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/sterling_silver.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/sterling_silver.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/styrene_butadiene_rubber.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/styrene_butadiene_rubber.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/styrene_butadiene_rubber.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/titanium.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/titanium.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/titanium.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/trinavine.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/trinavine.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/trinavine.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/tungsten_carbide.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/tungsten_carbide.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/tungsten_carbide.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/tungsten_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/tungsten_steel.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/tungsten_steel.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/ultimet.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/ultimet.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/ultimet.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/vanadium_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/vanadium_steel.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/vanadium_steel.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/definition/wrought_iron.json b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/wrought_iron.json new file mode 100644 index 00000000..7e74f6bf --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/definition/wrought_iron.json @@ -0,0 +1,6 @@ +{ + "craftable": true, + "hidden": false, + "sortOrder": 10, + "tier": 0 +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/shiboubouya_dn_tube.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/aluminium.json similarity index 100% rename from src/generated/resources/data/cosmiccore/tinkering/materials/stats/shiboubouya_dn_tube.json rename to src/generated/resources/data/cosmiccore/tinkering/materials/stats/aluminium.json diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/blue_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/blue_steel.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/blue_steel.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/bronze.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/bronze.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/bronze.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/cobalt_brass.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/cobalt_brass.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/cobalt_brass.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/damascus_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/damascus_steel.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/damascus_steel.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/duranium.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/duranium.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/duranium.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/hsse.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/hsse.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/hsse.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/invar.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/invar.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/invar.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/iron.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/iron.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/iron.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/naquadah_alloy.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/naquadah_alloy.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/naquadah_alloy.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/netherite.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/netherite.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/netherite.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/neutronite.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/neutronite.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/neutronite.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/neutronium.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/neutronium.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/neutronium.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/polybenzimidazole.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/polybenzimidazole.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/polybenzimidazole.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/polyethylene.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/polyethylene.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/polyethylene.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/polytetrafluoroethylene.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/polytetrafluoroethylene.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/polytetrafluoroethylene.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/red_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/red_steel.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/red_steel.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/rose_gold.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/rose_gold.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/rose_gold.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/rubber.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/rubber.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/rubber.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/silicone_rubber.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/silicone_rubber.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/silicone_rubber.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/stainless_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/stainless_steel.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/stainless_steel.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/steel.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/steel.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/sterling_silver.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/sterling_silver.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/sterling_silver.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/styrene_butadiene_rubber.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/styrene_butadiene_rubber.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/styrene_butadiene_rubber.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/titanium.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/titanium.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/titanium.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/trinavine.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/trinavine.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/trinavine.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/tungsten_carbide.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/tungsten_carbide.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/tungsten_carbide.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/tungsten_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/tungsten_steel.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/tungsten_steel.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/ultimet.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/ultimet.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/ultimet.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/vanadium_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/vanadium_steel.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/vanadium_steel.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/stats/wrought_iron.json b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/wrought_iron.json new file mode 100644 index 00000000..e50bd69c --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/stats/wrought_iron.json @@ -0,0 +1,24 @@ +{ + "stats": { + "tconstruct:binding": {}, + "tconstruct:bowstring": {}, + "tconstruct:grip": { + "accuracy": 10.0, + "durability": 3000.0, + "melee_damage": 20.0 + }, + "tconstruct:handle": { + "durability": 3000.0, + "melee_damage": 10.0, + "melee_speed": 4.0, + "mining_speed": 10.0 + }, + "tconstruct:head": { + "durability": 2200, + "melee_attack": 5.0, + "mining_speed": 10.0, + "mining_tier": "minecraft:iron" + }, + "tconstruct:repair_kit": {} + } +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/shiboubouya_dn_tube.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/aluminium.json similarity index 100% rename from src/generated/resources/data/cosmiccore/tinkering/materials/traits/shiboubouya_dn_tube.json rename to src/generated/resources/data/cosmiccore/tinkering/materials/traits/aluminium.json diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/blue_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/blue_steel.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/blue_steel.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/bronze.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/bronze.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/bronze.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/cobalt_brass.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/cobalt_brass.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/cobalt_brass.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/damascus_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/damascus_steel.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/damascus_steel.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/duranium.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/duranium.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/duranium.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/hsse.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/hsse.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/hsse.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/invar.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/invar.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/invar.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/iron.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/iron.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/iron.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/naquadah_alloy.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/naquadah_alloy.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/naquadah_alloy.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/netherite.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/netherite.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/netherite.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/neutronite.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/neutronite.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/neutronite.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/neutronium.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/neutronium.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/neutronium.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/polybenzimidazole.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/polybenzimidazole.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/polybenzimidazole.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/polyethylene.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/polyethylene.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/polyethylene.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/polytetrafluoroethylene.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/polytetrafluoroethylene.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/polytetrafluoroethylene.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/red_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/red_steel.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/red_steel.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/rose_gold.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/rose_gold.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/rose_gold.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/rubber.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/rubber.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/rubber.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/silicone_rubber.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/silicone_rubber.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/silicone_rubber.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/stainless_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/stainless_steel.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/stainless_steel.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/steel.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/steel.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/sterling_silver.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/sterling_silver.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/sterling_silver.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/styrene_butadiene_rubber.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/styrene_butadiene_rubber.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/styrene_butadiene_rubber.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/titanium.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/titanium.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/titanium.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/trinavine.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/trinavine.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/trinavine.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/tungsten_carbide.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/tungsten_carbide.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/tungsten_carbide.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/tungsten_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/tungsten_steel.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/tungsten_steel.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/ultimet.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/ultimet.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/ultimet.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/vanadium_steel.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/vanadium_steel.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/vanadium_steel.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/cosmiccore/tinkering/materials/traits/wrought_iron.json b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/wrought_iron.json new file mode 100644 index 00000000..71f7732a --- /dev/null +++ b/src/generated/resources/data/cosmiccore/tinkering/materials/traits/wrought_iron.json @@ -0,0 +1,8 @@ +{ + "default": [ + { + "level": 1, + "name": "cosmiccore:wrench_switch" + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/ghostipedia/cosmiccore/CosmicCore.java b/src/main/java/com/ghostipedia/cosmiccore/CosmicCore.java index 0ebecc4d..322f08b9 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/CosmicCore.java +++ b/src/main/java/com/ghostipedia/cosmiccore/CosmicCore.java @@ -133,6 +133,7 @@ public void modifyExistingMaterials(PostMaterialEvent event) { @SubscribeEvent public void commonSetup(FMLCommonSetupEvent event) { event.enqueueWork(() -> { + TinkersMaterials.init(); MapIngredientTypeManager.registerMapIngredient(Integer.class, MapSoulIngredient::convertToMapIngredient); MapIngredientTypeManager.registerMapIngredient(Double.class, MapEmberIngredient::convertToMapIngredient); GridLinkables.register(CosmicItems.LINKED_TERMINAL, LinkedTerminalBehavior.handler); diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java index edc34057..3fca9033 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicMaterialTraits.java @@ -30,32 +30,6 @@ public CosmicMaterialTraits(PackOutput packOutput, AbstractMaterialDataProvider super(packOutput, materials); } - public static final TinkersMaterial TEST_MATERIAL = new TinkersMaterial.Builder("shiboubouya_dn_tube") - .materialValue(2) - .headMaterialStats(2200, 10.0f, Tiers.IRON, 5.0f) - .gripMaterialStats(3000, 10.0f, 20) - .handleMaterialStats(3000, 10, 4, 10) - .addStatlessType(StatlessMaterialStats.BINDING) - .addStatlessType(StatlessMaterialStats.REPAIR_KIT) - .addStatlessType(StatlessMaterialStats.BOWSTRING) - .defaultTrait(CosmicCoreModifiers.wrenchModeSwitch.getId()) - .trait(() -> new ModifierEntry(CosmicCoreModifiers.wrenchModeSwitch.get(), 3), MaterialRegistry.RANGED) - .trait(() -> new ModifierEntry(TinkerModifiers.decay.get(), 1), MaterialRegistry.MELEE_HARVEST) - .sortOrder(10) - .craftable(true) - .colorMapping( - GreyToColorMapping.builder() - .addARGB(0, 0xFFFF66CC) - .addARGB(85, 0xFFFF99DD) - .addARGB(170, 0xFF99CCFF) - .addARGB(255, 0xFF66CCFF) - .build()) - .fallback("silver") - .fallback("iron") - .color(0xFFADD8E6) - .Ingredient(Ingredient.of(ChemicalHelper.getIngot(GTMaterials.Neutronium, 1)), 1, 2) - .build(); - @Override protected void addMaterialTraits() { for (TinkersMaterial material : TinkersMaterial.MATERIALS) { diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java index f7fa394f..a36f6ce5 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/datagen/CosmicTinkersRecipeProvider.java @@ -23,7 +23,7 @@ public CosmicTinkersRecipeProvider(PackOutput generator) { @Override protected void buildRecipes(Consumer consumer) { for (TinkersMaterial tinkersMaterial : TinkersMaterial.MATERIALS) { - String folder = "tools/material/"; + String folder = "tinkers/tools/material/"; materialRecipe(consumer, tinkersMaterial.getMaterialLocation(), tinkersMaterial.getIngredient(), tinkersMaterial.getValue(), tinkersMaterial.getNeeded(), folder + tinkersMaterial.getName()); } diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java index 43accf78..68aae943 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/data/materials/tinkers/TinkersMaterial.java @@ -67,10 +67,6 @@ private TinkersMaterial(Builder builder) { this.needed = builder.needed; } - public List getStats() { - return this.stats; - } - public static final class Builder { private IColorMapping colorMapping; diff --git a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java index a2d6aa8c..ba392ef5 100644 --- a/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java +++ b/src/main/java/com/ghostipedia/cosmiccore/common/item/tcon/TinkersMaterials.java @@ -1,188 +1,64 @@ package com.ghostipedia.cosmiccore.common.item.tcon; +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 static void init() { - /* - * new TinkersMaterial.Builder("one") - * .headMaterialStats(100, 5.0f, Tiers.WOOD, 1.0f) - * .craftable(true).tier(1) - * .trait( () -> new ModifierEntry(TinkerModifiers.decay.get(), 1), MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("two") - * .headMaterialStats(120, 5.5f, Tiers.WOOD, 1.2f) - * .craftable(true).tier(1) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("three") - * .headMaterialStats(140, 6.0f, Tiers.STONE, 1.4f) - * .craftable(true).tier(2) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("four") - * .headMaterialStats(160, 6.5f, Tiers.STONE, 1.6f) - * .craftable(true).tier(2) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("five") - * .headMaterialStats(180, 7.0f, Tiers.IRON, 1.8f) - * .craftable(true).tier(2) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("six") - * .headMaterialStats(200, 7.5f, Tiers.IRON, 2.0f) - * .craftable(true).tier(2) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("seven") - * .headMaterialStats(220, 8.0f, Tiers.IRON, 2.2f) - * .craftable(true).tier(2) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("eight") - * .headMaterialStats(240, 8.5f, Tiers.DIAMOND, 2.4f) - * .craftable(true).tier(3) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("nine") - * .headMaterialStats(260, 9.0f, Tiers.DIAMOND, 2.6f) - * .craftable(true).tier(3) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("ten") - * .headMaterialStats(280, 9.5f, Tiers.DIAMOND, 2.8f) - * .craftable(true).tier(3) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("eleven") - * .headMaterialStats(300, 10.0f, Tiers.NETHERITE, 3.0f) - * .craftable(true).tier(4) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("twelve") - * .headMaterialStats(320, 10.5f, Tiers.NETHERITE, 3.2f) - * .craftable(true).tier(4) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("thirteen") - * .headMaterialStats(340, 11.0f, Tiers.NETHERITE, 3.4f) - * .craftable(true).tier(4) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("fourteen") - * .headMaterialStats(360, 11.5f, Tiers.NETHERITE, 3.6f) - * .craftable(true).tier(4) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("fifteen") - * .headMaterialStats(380, 12.0f, Tiers.NETHERITE, 3.8f) - * .craftable(true).tier(4) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("sixteen") - * .headMaterialStats(400, 12.5f, Tiers.NETHERITE, 4.0f) - * .craftable(true).tier(4) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("seventeen") - * .headMaterialStats(420, 13.0f, Tiers.NETHERITE, 4.2f) - * .craftable(true).tier(4) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("eighteen") - * .headMaterialStats(440, 13.5f, Tiers.NETHERITE, 4.4f) - * .craftable(true).tier(4) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("nineteen") - * .headMaterialStats(460, 14.0f, Tiers.NETHERITE, 4.6f) - * .craftable(true).tier(4) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("twenty") - * .headMaterialStats(480, 14.5f, Tiers.NETHERITE, 4.8f) - * .craftable(true).tier(4) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("twentyone") - * .headMaterialStats(500, 15.0f, Tiers.NETHERITE, 5.0f) - * .craftable(true).tier(5) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("twentytwo") - * .headMaterialStats(520, 15.5f, Tiers.NETHERITE, 5.2f) - * .craftable(true).tier(5) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("twentythree") - * .headMaterialStats(540, 16.0f, Tiers.NETHERITE, 5.4f) - * .craftable(true).tier(5) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("twentyfour") - * .headMaterialStats(560, 16.5f, Tiers.NETHERITE, 5.6f) - * .craftable(true).tier(5) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("twentyfive") - * .headMaterialStats(580, 17.0f, Tiers.NETHERITE, 5.8f) - * .craftable(true).tier(5) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("twentysix") - * .headMaterialStats(600, 17.5f, Tiers.NETHERITE, 6.0f) - * .craftable(true).tier(5) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("twentyseven") - * .headMaterialStats(620, 18.0f, Tiers.NETHERITE, 6.2f) - * .craftable(true).tier(5) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("twentyeight") - * .headMaterialStats(640, 18.5f, Tiers.NETHERITE, 6.4f) - * .craftable(true).tier(5) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("twentynine") - * .headMaterialStats(660, 19.0f, Tiers.NETHERITE, 6.6f) - * .craftable(true).tier(5) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - * - * new TinkersMaterial.Builder("thirty") - * .headMaterialStats(680, 19.5f, Tiers.NETHERITE, 6.8f) - * .craftable(true).tier(5) - * .trait(TinkerModifiers.decay.get(), 1, MaterialRegistry.MELEE_HARVEST) - * .build(); - */ + + for(Material material : GTCEuAPI.materialManager.getRegisteredMaterials()) { + if (!material.hasProperty(PropertyKey.INGOT)){ + continue; + } + + if(material.hasProperty(PropertyKey.TOOL)){ + + new TinkersMaterial.Builder(material.getName()) + .materialValue(2) + .headMaterialStats(2200, 10.0f, Tiers.IRON, 5.0f) + .gripMaterialStats(3000, 10.0f, 20) + .handleMaterialStats(3000, 10, 4, 10) + .addStatlessType(StatlessMaterialStats.BINDING) + .addStatlessType(StatlessMaterialStats.REPAIR_KIT) + .addStatlessType(StatlessMaterialStats.BOWSTRING) + .defaultTrait(CosmicCoreModifiers.wrenchModeSwitch.getId()) + .trait(() -> new ModifierEntry(CosmicCoreModifiers.wrenchModeSwitch.get(), 3), MaterialRegistry.RANGED) + .trait(() -> new ModifierEntry(TinkerModifiers.decay.get(), 1), MaterialRegistry.MELEE_HARVEST) + .sortOrder(10) + .craftable(true) + .colorMapping( + GreyToColorMapping.builder() + .addARGB(0, 0xFFFF66CC) + .addARGB(85, 0xFFFF99DD) + .addARGB(170, 0xFF99CCFF) + .addARGB(255, 0xFF66CCFF) + .build()) + .fallback("silver") + .fallback("iron") + .color(material.getMaterialARGB()) + .Ingredient(Ingredient.of(ChemicalHelper.getIngot(material, GTValues.M)), 1, 2) + .build(); + + + + } + + } } }