Skip to content

Commit

Permalink
All works :)
Browse files Browse the repository at this point in the history
SteveeTheEpic committed Jun 30, 2024
1 parent 73804ba commit 9da2399
Showing 18 changed files with 90 additions and 43 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
- Mod Updated to Gregtech 1.2.3.a
- BEWARE! This is the last update on (Legacy or 0.1.0) version of the mod
- completely new chains are coming are in the future which are not compatible...
- ALWAYS BACKUP YOUR WORLDS BEFORE UPDATING!
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ dependencyResolutionManagement {
def kjsVersion = "2001.6.4-build.120"

// Forge
def forgeVersion = "47.1.3"
def forgeVersion = "47.3.0"
def registrateForgeVersion = "MC1.20-1.3.3"
def topForgeVersion = "1.20.1-10.0.1-3"
def radiumVersion = "0.12.2+git.5f80f74"
9 changes: 9 additions & 0 deletions src/generated/resources/assets/gtb/lang/en_ud.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"block.gtb.bacteria_bath": "ɥʇɐᗺ ɐıɹǝʇɔɐᗺ",
"block.gtb.bacteria_generator": "ɹoʇɐɹǝuǝ⅁ ɐıɹǝʇɔɐᗺ",
"block.gtb.collector": "ɹoʇɔǝןןoƆ",
"item.gtb.bacteria_petri_dish": "ɥsıᗡ ıɹʇǝԀ ɐıɹǝʇɔɐᗺ",
"item.gtb.sterile_petri_dish": "ɥsıᗡ ıɹʇǝԀ ǝןıɹɐʇS",
"material.gtb.lud": "pnꞀ",
"material.gtb.susium": "ɯnısnS"
}
9 changes: 9 additions & 0 deletions src/generated/resources/assets/gtb/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"block.gtb.bacteria_bath": "Bacteria Bath",
"block.gtb.bacteria_generator": "Bacteria Generator",
"block.gtb.collector": "Collector",
"item.gtb.bacteria_petri_dish": "Bacteria Petri Dish",
"item.gtb.sterile_petri_dish": "Starile Petri Dish",
"material.gtb.lud": "Lud",
"material.gtb.susium": "Susium"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "gtb:item/bacteria_petri_dish"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "gtb:item/sterile_petri_dish"
}
}
1 change: 1 addition & 0 deletions src/generated/resources/assets/gtb/sounds.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
2 changes: 1 addition & 1 deletion src/main/java/stevee/gtb/common/data/GTBElements.java
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ public class GTBElements {
}

public static final Element Lu = createAndRegister(-5, 0, -1, null, "Lu", "Lud", false);
public static final Element Retardium = createAndRegister(69420, 140000, 1, "Trinium", "Retardium", "Rt", false);
public static final Element Retardium = createAndRegister(69420, 187, 1, "Trinium", "Retardium", "Rt", false);
public static final Element Susium = createAndRegister(-1, 0, -1, null, "Susium", "ඞ", false);


5 changes: 0 additions & 5 deletions src/main/java/stevee/gtb/common/data/GTBItems.java
Original file line number Diff line number Diff line change
@@ -16,11 +16,6 @@ public class GTBItems {
.defaultModel()
.register();

public static final ItemEntry<Item> USED_PETRI_DISH = REGISTRATE.item("used_petri_dish", Item::new)
.lang("Used Petri Dish")
.defaultModel()
.register();

public static final ItemEntry<Item> STERILE_PETRI_DISH = REGISTRATE.item("sterile_petri_dish", Item::new)
.lang("Starile Petri Dish")
.defaultModel()
28 changes: 25 additions & 3 deletions src/main/java/stevee/gtb/common/data/GTBMachines.java
Original file line number Diff line number Diff line change
@@ -16,8 +16,7 @@


import static com.gregtechceu.gtceu.api.GTValues.LuV;
import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STAINLESS_CLEAN;
import static com.gregtechceu.gtceu.common.data.GTBlocks.CASING_STEEL_SOLID;
import static com.gregtechceu.gtceu.common.data.GTBlocks.*;
import static stevee.gtb.registry.GTBRegistries.REGISTRATE;
import static com.gregtechceu.gtceu.api.pattern.Predicates.*;

@@ -44,7 +43,7 @@ public class GTBMachines {
.or(abilities(PartAbility.INPUT_ENERGY))
.or(autoAbilities(true, false, false)))
.where('C', controller(blocks(definition.getBlock())))
.where('S', blocks(GTBlocks.CASING_TEMPERED_GLASS.get()))
.where('S', blocks(CASING_TEMPERED_GLASS.get()))
.where('F', blocks(ChemicalHelper.getBlock(TagPrefix.frameGt, GTMaterials.NaquadahAlloy)))
.where(' ', any())
.build())
@@ -74,6 +73,29 @@ public class GTBMachines {
GTCEu.id("block/multiblock/implosion_compressor"))
.register();

public static final MultiblockMachineDefinition BACTERIA_GENERATOR = REGISTRATE.multiblock("bacteria_generator", WorkableElectricMultiblockMachine::new)
.rotationState(RotationState.NON_Y_AXIS)
.appearanceBlock(() -> HIGH_POWER_CASING.get())
.recipeType(GTBRecipeTypes.BACTERIA_GENERATOR)
.pattern(definition -> FactoryBlockPattern.start()
.aisle("HHHH", "HHHH", "HHHH")
.aisle("HHHH", "R M", "HTTH")
.aisle("HHHH", "HCHH", "HHHH")
.where('H', blocks(HIGH_POWER_CASING.get())
.or(autoAbilities(true, false, false))
.or(abilities(PartAbility.IMPORT_ITEMS))
.or(abilities(PartAbility.IMPORT_FLUIDS))
.or(abilities(PartAbility.OUTPUT_ENERGY))
.or(abilities(PartAbility.OUTPUT_LASER)))
.where('C', controller(blocks(definition.getBlock())))
.where('M', abilities(PartAbility.MUFFLER))
.where('R', abilities(PartAbility.ROTOR_HOLDER))
.where('T', blocks(CASING_TEMPERED_GLASS.get()))
.build())
.workableCasingRenderer(GTCEu.id("block/casings/solid/machine_casing_solid_steel"),
GTCEu.id("block/multiblock/implosion_compressor"))
.register();


public static void init() {
}
2 changes: 1 addition & 1 deletion src/main/java/stevee/gtb/common/data/GTBMaterials.java
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ public static void init() {
.buildAndRegister()
.setFormula("Lud", true);

public static final Material Susium_Ingot = new Material.Builder(GTBacteria.id("susium"))
public static final Material Susium = new Material.Builder(GTBacteria.id("susium"))
.dust().color(0xff0037)
.iconSet(SHINY)
.buildAndRegister()
2 changes: 2 additions & 0 deletions src/main/java/stevee/gtb/common/data/GTBRecipes.java
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
import stevee.gtb.data.recipe.chemistry.Bacteria;
import stevee.gtb.data.recipe.chemistry.MiscRecipes;
import net.minecraft.data.recipes.FinishedRecipe;
import stevee.gtb.data.recipe.energy.Bacteria_Energy;

import java.util.function.Consumer;

@@ -16,5 +17,6 @@ public static void init(Consumer<FinishedRecipe> provider) {
MiscRecipes.init(provider);
Bacteria.init(provider);
Collector.init(provider);
Bacteria_Energy.init(provider);
}
}
12 changes: 1 addition & 11 deletions src/main/java/stevee/gtb/data/lang/LangHandler.java
Original file line number Diff line number Diff line change
@@ -12,28 +12,18 @@ public class LangHandler extends com.gregtechceu.gtceu.data.lang.LangHandler {


private static final Set<Material> MATERIALS = Set.of(

);


public static void init(RegistrateLangProvider provider) {
provider.add("gtb.recipe.cleanerroom.display_name", "Ultra-sterile Cleanroom");

provider.add("gtb.gui.bacteria_bath", "Bacteria Bath");
provider.add("block.gtb.bacteria_bath", "Bacteria Bath Controller");
provider.add("item.gtb.bacteria_petri_dish", "Bacteria Petri Dish");
provider.add("item.gtb.used:petri_dish", "Used Petri Dish");
initItemTooltips(provider);

}
private static void initItemTooltips(RegistrateLangProvider provider) {

// materials
for (Material material : MATERIALS) {
provider.add(material.getUnlocalizedName(), toEnglishName(material.getName()));
}
multilineLang(provider, "item.gtb.echo_processor.tooltip", "§7I dont know anymore...\n§3ZPM-Tier Circuit");
multilineLang(provider, "item.gtb.echo_processor_assembly.tooltip", "§7Is it Dead or is it Alive?\n§3UV-Tier Circuit");
multilineLang(provider, "item.gtb.echo_processor_supercomputer.tooltip", "§7This seems normal.(If you can call this normal)\n§3UHV-Tier Circuit");
multilineLang(provider, "item.gtb.echo_processor_mainframe.tooltip", "§7What have i done?\n§3UEV-Tier Circuit");
}
}
11 changes: 3 additions & 8 deletions src/main/java/stevee/gtb/data/recipe/chemistry/Bacteria.java
Original file line number Diff line number Diff line change
@@ -23,25 +23,20 @@ public static void init(Consumer<FinishedRecipe> provider) {
.outputItems(GTBItems.BACTERIA_PETRI_DISH, 1)
.duration(400).EUt(VA[LuV]).save(provider);

BACTERIA_RECIPES.recipeBuilder(GTBacteria.id("make_bacteria_from_bacteria_petri_dishes"))
BACTERIA_RECIPES.recipeBuilder(GTBacteria.id("make_bacteria"))
.notConsumable(GTBItems.BACTERIA_PETRI_DISH)
.circuitMeta(0)
.outputFluids(GTMaterials.Bacteria.getFluid(1))
.duration(800).EUt(VA[LuV]).save(provider);

BACTERIA_RECIPES.recipeBuilder(GTBacteria.id("make_more_bacteria_from_bacteria_petri_dish"))
BACTERIA_RECIPES.recipeBuilder(GTBacteria.id("make_more_bacteria"))
.circuitMeta(1)
.notConsumable(GTBItems.BACTERIA_PETRI_DISH)
.inputItems(GTItems.BIO_CHAFF, 4)
.outputFluids(Bacteria.getFluid(4))
.duration(200).EUt(VA[LuV]).save(provider);


AUTOCLAVE_RECIPES.recipeBuilder(GTBacteria.id("clean_used_petri_dishes"))
.inputItems(GTBItems.USED_PETRI_DISH, 1)
.inputFluids(DistilledWater.getFluid(25))
.outputItems(GTItems.PETRI_DISH, 1)
.duration(200).EUt(VA[LuV]).save(provider);

AUTOCLAVE_RECIPES.recipeBuilder(GTBacteria.id("sterilize_petri_dishes"))
.inputItems(GTItems.PETRI_DISH, 1)
.inputFluids(Chlorine.getFluid(16))
25 changes: 25 additions & 0 deletions src/main/java/stevee/gtb/data/recipe/energy/Bacteria_Energy.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package stevee.gtb.data.recipe.energy;

import com.gregtechceu.gtceu.api.recipe.GTRecipe;
import com.gregtechceu.gtceu.common.data.*;
import net.minecraft.data.recipes.FinishedRecipe;
import stevee.gtb.GTBacteria;
import stevee.gtb.common.data.GTBMachines;

import java.util.function.Consumer;

import static stevee.gtb.common.data.GTBRecipeTypes.*;
import static com.gregtechceu.gtceu.api.GTValues.*;

public class Bacteria_Energy {

public static void init(Consumer<FinishedRecipe> provider) {

BACTERIA_GENERATOR.recipeBuilder(GTBacteria.id("energy_from_bacteria"))
.inputFluids(GTMaterials.Bacteria.getFluid(1))
.outputEU(VA[EV])
.circuitMeta(1)
.duration(1).save(provider);

}
}
12 changes: 0 additions & 12 deletions src/main/java/stevee/util/GTECUtil.java

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9da2399

Please sign in to comment.