From feaff3090787124c6013b8a225c1879d4a79d16b Mon Sep 17 00:00:00 2001 From: NemEzanevem <99277804+NemEzanevem@users.noreply.github.com> Date: Sun, 3 Mar 2024 21:43:26 +0100 Subject: [PATCH] Additional Fixes/Preparation for an Alpha Release --- gradle.properties | 4 +- src/generated/assets/gtec/lang/en_ud.json | 2 +- src/generated/assets/gtec/lang/en_us.json | 4 +- .../argent_matter/gtec/GTExtendedChem.java | 2 + .../argent_matter/gtec/block/GTECBlocks.java | 22 ++++- .../gtec/common/data/GTECItems.java | 6 +- .../gtec/common/data/GTECMaterials.java | 4 - .../gtec/data/lang/LangHandler.java | 14 +-- .../gtec/data/recipe/CircuitRecipes.java | 30 ++++++ .../gtec/registry/GTECCreativeModeTabs.java | 20 ++++ .../resources/assets/gtec/lang/hu_hu.json | 93 ------------------- 11 files changed, 90 insertions(+), 111 deletions(-) create mode 100644 src/main/java/argent_matter/gtec/data/recipe/CircuitRecipes.java delete mode 100644 src/main/resources/assets/gtec/lang/hu_hu.json diff --git a/gradle.properties b/gradle.properties index 9e427be..54888ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,14 +16,14 @@ loom.platform=forge parchment_mappings=2023.09.03 # Mod Properties - mod_version=0.1.2 + mod_version=0.1.0.alpha maven_group=argent_matter.gtec archives_base_name=gtec mod_id=gtec mod_author=NemEzanevem, screret # Dependencies - gtceu_version=1.1.3 + gtceu_version=1.1.3.b ldlib_version=1.0.23 registrate_version=MC1.20-1.3.11 kubejs_version=2001.6.3-build.37 diff --git a/src/generated/assets/gtec/lang/en_ud.json b/src/generated/assets/gtec/lang/en_ud.json index 4ae3b6f..7e88474 100644 --- a/src/generated/assets/gtec/lang/en_ud.json +++ b/src/generated/assets/gtec/lang/en_ud.json @@ -65,8 +65,8 @@ "material.gtec.rarest_metal_residue": "ǝnpısǝᴚ ןɐʇǝW ʇsǝɹɐᴚ", "material.gtec.red_zircon": "uoɔɹıZ pǝᴚ", "material.gtec.refined_platinum_salt": "ʇןɐS ɯnuıʇɐןԀ pǝuıɟǝᴚ", - "material.gtec.repercipitated_platinum": "ɯnuıʇɐןԀ pǝʇɐʇıdıɔɹǝdǝᴚ", "material.gtec.reprecipitated_palladium": "ɯnıpɐןןɐԀ pǝʇɐʇıdıɔǝɹdǝᴚ", + "material.gtec.reprecipitated_platinum": "ɯnuıʇɐןԀ pǝʇɐʇıdıɔǝɹdǝᴚ", "material.gtec.reprecipitated_rhodium": "ɯnıpoɥᴚ pǝʇɐʇıdıɔǝɹdǝᴚ", "material.gtec.rhodium_filter_cake": "ǝʞɐƆ ɹǝʇןıℲ ɯnıpoɥᴚ", "material.gtec.rhodium_filter_cake_solution": "uoıʇnןoS ǝʞɐƆ ɹǝʇןıℲ ɯnıpoɥᴚ", diff --git a/src/generated/assets/gtec/lang/en_us.json b/src/generated/assets/gtec/lang/en_us.json index 4d873f4..a9dc6f0 100644 --- a/src/generated/assets/gtec/lang/en_us.json +++ b/src/generated/assets/gtec/lang/en_us.json @@ -11,7 +11,7 @@ "item.gtec.echo_processor_mainframe.tooltip.0": "§7What have i done?", "item.gtec.echo_processor_mainframe.tooltip.1": "§3UEV-Tier Circuit", "item.gtec.echo_processor_supercomputer": "Echo Processor Supercomputer", - "item.gtec.echo_processor_supercomputer.tooltip.0": "§7This seems normal...(If you can call this normal)", + "item.gtec.echo_processor_supercomputer.tooltip.0": "§7This seems normal.(If you can call this normal)", "item.gtec.echo_processor_supercomputer.tooltip.1": "§3UHV-Tier Circuit", "item.gtec.petri_dish_with_sculk_culture": "Petri Dish with Sculk Culture", "material.gtec.acidic_iridium_solution": "Acidic Iridium Solution", @@ -65,8 +65,8 @@ "material.gtec.rarest_metal_residue": "Rarest Metal Residue", "material.gtec.red_zircon": "Red Zircon", "material.gtec.refined_platinum_salt": "Refined Platinum Salt", - "material.gtec.repercipitated_platinum": "Repercipitated Platinum", "material.gtec.reprecipitated_palladium": "Reprecipitated Palladium", + "material.gtec.reprecipitated_platinum": "Reprecipitated Platinum", "material.gtec.reprecipitated_rhodium": "Reprecipitated Rhodium", "material.gtec.rhodium_filter_cake": "Rhodium Filter Cake", "material.gtec.rhodium_filter_cake_solution": "Rhodium Filter Cake Solution", diff --git a/src/main/java/argent_matter/gtec/GTExtendedChem.java b/src/main/java/argent_matter/gtec/GTExtendedChem.java index 41488a7..8181f97 100644 --- a/src/main/java/argent_matter/gtec/GTExtendedChem.java +++ b/src/main/java/argent_matter/gtec/GTExtendedChem.java @@ -2,6 +2,7 @@ import argent_matter.gtec.block.GTECBlocks; import argent_matter.gtec.common.data.*; +import argent_matter.gtec.registry.GTECCreativeModeTabs; import argent_matter.gtec.registry.GTECRegistries; import argent_matter.gtec.data.GTECDatagen; import com.gregtechceu.gtceu.api.GTCEuAPI; @@ -34,6 +35,7 @@ public static void init() { //.init(); GTECRecipeTypes.init(); GTECItems.init(); + GTECCreativeModeTabs.init(); GTECMachines.init(); GTECBlocks.init(); diff --git a/src/main/java/argent_matter/gtec/block/GTECBlocks.java b/src/main/java/argent_matter/gtec/block/GTECBlocks.java index bc97303..600c92b 100644 --- a/src/main/java/argent_matter/gtec/block/GTECBlocks.java +++ b/src/main/java/argent_matter/gtec/block/GTECBlocks.java @@ -1,9 +1,29 @@ package argent_matter.gtec.block; + +import com.gregtechceu.gtceu.api.block.ICoilType; +import com.gregtechceu.gtceu.api.item.tool.GTToolType; +import com.gregtechceu.gtceu.common.block.CoilBlock; +import com.tterrag.registrate.util.entry.BlockEntry; +import dev.latvian.mods.rhino.ast.Block; +import net.minecraft.tags.BlockTags; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.IceBlock; + +import java.util.HashMap; +import java.util.Map; +import java.util.function.Supplier; + +import static argent_matter.gtec.registry.GTECRegistries.REGISTRATE; + + @SuppressWarnings("unused") public class GTECBlocks { - public static void init() { + // Crystal Matrix Coil Block + + + public static void init() { } } diff --git a/src/main/java/argent_matter/gtec/common/data/GTECItems.java b/src/main/java/argent_matter/gtec/common/data/GTECItems.java index 3cb47cd..6b5d386 100644 --- a/src/main/java/argent_matter/gtec/common/data/GTECItems.java +++ b/src/main/java/argent_matter/gtec/common/data/GTECItems.java @@ -1,5 +1,6 @@ package argent_matter.gtec.common.data; +import argent_matter.gtec.registry.GTECCreativeModeTabs; import com.tterrag.registrate.util.entry.ItemEntry; import static argent_matter.gtec.registry.GTECRegistries.REGISTRATE; import net.minecraft.world.item.Item; @@ -7,6 +8,10 @@ @SuppressWarnings("Convert2MethodRef") public class GTECItems { + static { + REGISTRATE.creativeModeTab(() -> GTECCreativeModeTabs.ITEM); + } + // Echo Circuit Stuff public static final ItemEntry PETRIDISHWITHSCULKCULTURE = REGISTRATE.item("petri_dish_with_sculk_culture", Item::new) @@ -44,6 +49,5 @@ public class GTECItems { .register(); public static void init() { - } } diff --git a/src/main/java/argent_matter/gtec/common/data/GTECMaterials.java b/src/main/java/argent_matter/gtec/common/data/GTECMaterials.java index ae1b67d..66a6444 100644 --- a/src/main/java/argent_matter/gtec/common/data/GTECMaterials.java +++ b/src/main/java/argent_matter/gtec/common/data/GTECMaterials.java @@ -130,8 +130,6 @@ public static void modifyMaterials () { public static final Material ZincSulfate = new Material.Builder(GTExtendedChem.id("zinc_sulfate")) .dust(1) .color(0x7C4D0E).iconSet(METALLIC) - .flags(DECOMPOSITION_BY_ELECTROLYZING) - .components(Zinc, 1, Sulfur, 1, Oxygen, 4) .buildAndRegister() .setFormula("ZnSO4", true); @@ -465,8 +463,6 @@ public static void modifyMaterials () { public static final Material Alumina = new Material.Builder(GTExtendedChem.id("alumina")) .dust() .color(0x64B5BF).iconSet(SHINY) - .components(Aluminium, 2, Oxygen, 3) - .flags(DECOMPOSITION_BY_ELECTROLYZING) .buildAndRegister() .setFormula("Al2O3", true); diff --git a/src/main/java/argent_matter/gtec/data/lang/LangHandler.java b/src/main/java/argent_matter/gtec/data/lang/LangHandler.java index 9f70b01..924698f 100644 --- a/src/main/java/argent_matter/gtec/data/lang/LangHandler.java +++ b/src/main/java/argent_matter/gtec/data/lang/LangHandler.java @@ -1,25 +1,25 @@ package argent_matter.gtec.data.lang; -import argent_matter.gtec.common.data.GTECMaterials; import com.gregtechceu.gtceu.api.data.chemical.material.Material; import com.tterrag.registrate.providers.RegistrateLangProvider; -import com.gregtechceu.gtceu.api.data.tag.TagPrefix; -import com.gregtechceu.gtceu.api.item.tool.GTToolType; -import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.tterrag.registrate.providers.RegistrateLangProvider; - import static com.gregtechceu.gtceu.utils.FormattingUtil.toEnglishName; import java.util.Set; -import static com.gregtechceu.gtceu.utils.FormattingUtil.toEnglishName; + public class LangHandler extends com.gregtechceu.gtceu.data.lang.LangHandler { + + private static final Set MATERIALS = Set.of( ); public static void init(RegistrateLangProvider provider) { + initItemTooltips(provider); + + } + private static void initItemTooltips(RegistrateLangProvider provider) { // materials for (Material material : MATERIALS) { diff --git a/src/main/java/argent_matter/gtec/data/recipe/CircuitRecipes.java b/src/main/java/argent_matter/gtec/data/recipe/CircuitRecipes.java new file mode 100644 index 0000000..8d05952 --- /dev/null +++ b/src/main/java/argent_matter/gtec/data/recipe/CircuitRecipes.java @@ -0,0 +1,30 @@ +package argent_matter.gtec.data.recipe; + +import argent_matter.gtec.common.data.GTECItems; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.data.recipe.CustomTags; +import net.minecraft.data.recipes.FinishedRecipe; +import argent_matter.gtec.GTExtendedChem; +import argent_matter.gtec.common.data.GTECMaterials; +import com.sun.jna.platform.win32.WinCrypt; +import com.sun.jna.platform.win32.WinNT; +import net.minecraft.client.model.CamelModel; +import net.minecraft.data.recipes.FinishedRecipe; + +import java.util.Objects; +import java.util.function.Consumer; +import static com.gregtechceu.gtceu.api.GTValues.*; +import static com.gregtechceu.gtceu.api.data.tag.TagPrefix.*; +import static com.gregtechceu.gtceu.common.data.GTMaterials.*; +import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.*; +import net.minecraft.data.recipes.FinishedRecipe; + +import java.util.function.Consumer; + +public class CircuitRecipes { + public static void init(Consumer provider) { + circuitBoardRecipess(provider); + } + public static void circuitBoardRecipess(Consumer provider) { + } +} diff --git a/src/main/java/argent_matter/gtec/registry/GTECCreativeModeTabs.java b/src/main/java/argent_matter/gtec/registry/GTECCreativeModeTabs.java index af4e76e..dbe3345 100644 --- a/src/main/java/argent_matter/gtec/registry/GTECCreativeModeTabs.java +++ b/src/main/java/argent_matter/gtec/registry/GTECCreativeModeTabs.java @@ -1,4 +1,24 @@ package argent_matter.gtec.registry; + +import argent_matter.gtec.GTExtendedChem; +import argent_matter.gtec.common.data.GTECItems; +import com.gregtechceu.gtceu.common.data.GTCreativeModeTabs; +import com.tterrag.registrate.util.entry.RegistryEntry; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.CreativeModeTab; + +import static argent_matter.gtec.registry.GTECRegistries.REGISTRATE; + public class GTECCreativeModeTabs { + public static RegistryEntry ITEM = REGISTRATE.defaultCreativeTab(GTExtendedChem.MOD_ID, + builder -> builder.displayItems(new GTCreativeModeTabs.RegistrateDisplayItemsGenerator(GTExtendedChem.MOD_ID, REGISTRATE)) + .icon(GTECItems.ECHO_PRINTED_CIRCUIT_BOARD::asStack) + .title(Component.literal("Gregtech Extended Chemistry")) + .build()) + .register(); + + public static void init() { + + } } diff --git a/src/main/resources/assets/gtec/lang/hu_hu.json b/src/main/resources/assets/gtec/lang/hu_hu.json deleted file mode 100644 index ee6e5e2..0000000 --- a/src/main/resources/assets/gtec/lang/hu_hu.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "item.gtec.echo_circuit_board": "Echo Circuit Board", - "item.gtec.echo_printed_circuit_board": "Echo Printed Circuit Board", - "item.gtec.echo_processor": "Echo Processor", - "item.gtec.echo_processor.tooltip.0": "§7I dont know anymore...", - "item.gtec.echo_processor.tooltip.1": "§3ZPM-Tier Circuit", - "item.gtec.echo_processor_assembly": "Echo Processor Assembly", - "item.gtec.echo_processor_assembly.tooltip.0": "§7Is it Dead or is it Alive?", - "item.gtec.echo_processor_assembly.tooltip.1": "§3UV-Tier Circuit", - "item.gtec.echo_processor_mainframe": "Echo Processor Mainframe", - "item.gtec.echo_processor_mainframe.tooltip.0": "§7What have i done?", - "item.gtec.echo_processor_mainframe.tooltip.1": "§3UEV-Tier Circuit", - "item.gtec.echo_processor_supercomputer": "Echo Processor Supercomputer", - "item.gtec.echo_processor_supercomputer.tooltip.0": "§7This seems normal...(If you can call this normal)", - "item.gtec.echo_processor_supercomputer.tooltip.1": "§3UHV-Tier Circuit", - "item.gtec.petri_dish_with_sculk_culture": "Petri Dish with Sculk Culture", - "material.gtec.acidic_iridium_solution": "Acidic Iridium Solution", - "material.gtec.acidic_monazite_powder": "Acidic Monazite Powder", - "material.gtec.alumina": "Alumina", - "material.gtec.ammonium_nitrate_solution": "Ammonium Nitrate Solution", - "material.gtec.cerium_chloride": "Cerium Chloride", - "material.gtec.cerium_dioxide": "Cerium Dioxide", - "material.gtec.cerium_iii_oxide": "Cerium (III) Oxide", - "material.gtec.cerium_oxalate": "Cerium Oxalate", - "material.gtec.cooled_monazite_rare_earth_concentrate": "Cooled Monazite Rare Earth Concentrate", - "material.gtec.crude_rhodium_metal": "Crude Rhodium Metal", - "material.gtec.diluted_monazite_rare_earth_mud": "Diluted Monazite Rare Earth Mud", - "material.gtec.diluted_monazite_sulfate": "Diluted Monazite Sulfate", - "material.gtec.diluted_rhodium_sulfate_solution": "Diluted Rhodium Sulfate Solution", - "material.gtec.dried_monazite_rare_earth_concentrate": "Dried Monazite Rare Earth Concentrate", - "material.gtec.europium_iii_oxide": "Europium (III) Oxide", - "material.gtec.europium_oxide": "Europium Oxide", - "material.gtec.formic_acid": "Formic Acid", - "material.gtec.hafnia": "Hafnia", - "material.gtec.hafnia_zirconia_blend": "Hafnia Zirconia Blend", - "material.gtec.hafnium_idodide": "Hafnium Idodide", - "material.gtec.hafnium_tetrachloride": "Hafnium Tetrachloride", - "material.gtec.hafnium_tetrachloride_solution": "Hafnium Tetrachloride Solution", - "material.gtec.heterogenic_halogenic_monazite_rare_earth_mixture": "Heterogenic Halogenic Monazite Rare Earth Mixture", - "material.gtec.hot_ruthenium_tetroxide_solution": "Hot Ruthenium Tetroxide Solution", - "material.gtec.iridium_dioxide": "Iridium Dioxide", - "material.gtec.leach_residue": "Leach Residue", - "material.gtec.low_purity_hafnium": "Low Purity Hafnium", - "material.gtec.metallic_sludge_residue": "Metallic Sludge Residue", - "material.gtec.monazite_rare_earth_filtrate": "Monazite Rare Earth Filtrate", - "material.gtec.monazite_rare_earth_hydroxide_concentrate": "Monazite Rare Earth Hydroxide Concentrate", - "material.gtec.monazite_sulfate": "Monazite Sulfate", - "material.gtec.monaziterarer_earth_sediment": "Monaziterarer Earth Sediment", - "material.gtec.muddy_monazite_rare_earth_solution": "Muddy Monazite Rare Earth Solution", - "material.gtec.neutralized_monazite_rare_earth_filtrate": "Neutralized Monazite Rare Earth Filtrate", - "material.gtec.neutralized_uranium_filtrate": "Neutralized Uranium Filtrate", - "material.gtec.nitric_leached_monazite_mixture": "Nitric Leached Monazite Mixture", - "material.gtec.nitric_monazatie_leached_concentrate": "Nitric Monazatie Leached Concentrate", - "material.gtec.nitrogenated_monazite_rare_earth_concentrate": "Nitrogenated Monazite Rare Earth Concentrate", - "material.gtec.osmium_solution": "Osmium Solution", - "material.gtec.oxalate": "Oxalate", - "material.gtec.palladium_enriched_ammonia": "Palladium Enriched Ammonia", - "material.gtec.palladium_metallic_powder": "Palladium Metallic Powder", - "material.gtec.palladium_salt": "Palladium Salt", - "material.gtec.platinum_concentrate": "Platinum Concentrate", - "material.gtec.platinum_metallic_powder": "Platinum Metallic Powder", - "material.gtec.platinum_residue": "Platinum Residue", - "material.gtec.platinum_salt": "Platinum Salt", - "material.gtec.potassium_disulfate": "Potassium Disulfate", - "material.gtec.rarest_metal_residue": "Rarest Metal Residue", - "material.gtec.red_zircon": "Red Zircon", - "material.gtec.refined_platinum_salt": "Refined Platinum Salt", - "material.gtec.repercipitated_platinum": "Repercipitated Platinum", - "material.gtec.reprecipitated_palladium": "Reprecipitated Palladium", - "material.gtec.reprecipitated_rhodium": "Reprecipitated Rhodium", - "material.gtec.rhodium_filter_cake": "Rhodium Filter Cake", - "material.gtec.rhodium_filter_cake_solution": "Rhodium Filter Cake Solution", - "material.gtec.rhodium_nitrate": "Rhodium Nitrate", - "material.gtec.rhodium_salt": "Rhodium Salt", - "material.gtec.rhodium_salt_solution": "Rhodium Salt Solution", - "material.gtec.ruthenium_tetroxide_solution": "Ruthenium Tetroxide Solution", - "material.gtec.samaric_residue": "Samaric Residue", - "material.gtec.satured_monazite_rare_earth": "Satured Monazite Rare Earth", - "material.gtec.sludge_dust_residue": "Isszappor Maradvány", - "material.gtec.sodium_formate": "Sodium Formate", - "material.gtec.sodium_nitrate": "Sodium Nitrate", - "material.gtec.sodium_ruthenate": "Nátrium-Rutenát", - "material.gtec.sodium_sulfate": "Nátrium Szulfát", - "material.gtec.thorium_dioxide": "Tórium Dioxid", - "material.gtec.thorium_phosphate_cake": "Tórium Foszfát Torta", - "material.gtec.thorium_phosphate_concentrate": "Tórium Foszfát Koncentrátum", - "material.gtec.uranium_filtrate": "Úrán Szűrlet", - "material.gtec.vanadium_pentoxide": "Vanádium Pentoxid", - "material.gtec.zinc_sulfate": "Cink Szulfát", - "material.gtec.zirconia": "Cirkónium-Dioxid", - "material.gtec.zirconium_tetrachloride": "Cirkónium Tetrachlorid", - "material.gtec.zirconium_tetrachloride_solution": "Cirkónium Tetraklorid Oldat" -} \ No newline at end of file