Skip to content

Commit

Permalink
Additional Fixes/Preparation for an Alpha Release
Browse files Browse the repository at this point in the history
  • Loading branch information
NemEzanevem committed Mar 3, 2024
1 parent 0f53ac5 commit feaff30
Show file tree
Hide file tree
Showing 11 changed files with 90 additions and 111 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/generated/assets/gtec/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -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ɥᴚ",
Expand Down
4 changes: 2 additions & 2 deletions src/generated/assets/gtec/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/argent_matter/gtec/GTExtendedChem.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -34,6 +35,7 @@ public static void init() {
//.init();
GTECRecipeTypes.init();
GTECItems.init();
GTECCreativeModeTabs.init();
GTECMachines.init();
GTECBlocks.init();

Expand Down
22 changes: 21 additions & 1 deletion src/main/java/argent_matter/gtec/block/GTECBlocks.java
Original file line number Diff line number Diff line change
@@ -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() {
}
}
6 changes: 5 additions & 1 deletion src/main/java/argent_matter/gtec/common/data/GTECItems.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
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;


@SuppressWarnings("Convert2MethodRef")
public class GTECItems {
static {
REGISTRATE.creativeModeTab(() -> GTECCreativeModeTabs.ITEM);
}


// Echo Circuit Stuff
public static final ItemEntry<Item> PETRIDISHWITHSCULKCULTURE = REGISTRATE.item("petri_dish_with_sculk_culture", Item::new)
Expand Down Expand Up @@ -44,6 +49,5 @@ public class GTECItems {
.register();

public static void init() {

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down
14 changes: 7 additions & 7 deletions src/main/java/argent_matter/gtec/data/lang/LangHandler.java
Original file line number Diff line number Diff line change
@@ -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<Material> MATERIALS = Set.of(
);


public static void init(RegistrateLangProvider provider) {
initItemTooltips(provider);

}
private static void initItemTooltips(RegistrateLangProvider provider) {

// materials
for (Material material : MATERIALS) {
Expand Down
30 changes: 30 additions & 0 deletions src/main/java/argent_matter/gtec/data/recipe/CircuitRecipes.java
Original file line number Diff line number Diff line change
@@ -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<FinishedRecipe> provider) {
circuitBoardRecipess(provider);
}
public static void circuitBoardRecipess(Consumer<FinishedRecipe> provider) {
}
}
Original file line number Diff line number Diff line change
@@ -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<CreativeModeTab> 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() {

}
}
93 changes: 0 additions & 93 deletions src/main/resources/assets/gtec/lang/hu_hu.json

This file was deleted.

0 comments on commit feaff30

Please sign in to comment.