Merge pull request #15 from Synthitic/0.0.5

0.0.5

.gitignore

@@ -20,3 +20,4 @@ build
 # other
 eclipse
 run
+libs

README.md

@@ -4,4 +4,4 @@
 
 Gregicality Legacy Port to CEu (specifically with reference to the Technological Journey fork)
 
-Requires latest versions of Gregtech: CEu, Gregicality Multiblocks, Material Replication, and GroovyScript and their dependencies to run.
+Requires [this](https://github.com/GregTechCEu/GregTech/releases/tag/nuclear-testing) version of Gregtech: CEu, [this](https://github.com/MrKono/MaterialReplication/releases/tag/1.3.0pre) version of Material Replication, and the latest versions of Gregicality Multiblocks, GroovyScript, ModularUI and their dependencies to run.

dependencies.gradle

@@ -23,14 +23,16 @@
  */
 dependencies {
     // Hard Dependencies
-    implementation rfg.deobf("curse.maven:gregtech-ce-unofficial-557242:5322654") // GTCEu 2.8.8
+    devOnlyNonPublishable(rfg.deobf(project.files("libs/gregtech-1.12.2-2.9.0-beta-dev.jar"))) // GTCEu 2.8.8
     implementation rfg.deobf("curse.maven:codechicken-lib-1-8-242818:2779848") // CCL 3.2.3.358
     implementation rfg.deobf("curse.maven:gregicality-multiblocks-564858:5121714") //GCYM 1.2.8
     implementation rfg.deobf("curse.maven:groovyscript-687577:5219945") //Groovyscript 1.0.1
-    implementation rfg.deobf("curse.maven:material-replication-874493:5054159") //Material replication 1.2.2
+    devOnlyNonPublishable(rfg.deobf(project.files("libs/MaterialReplication-1.3.0-pre1-dev.jar"))) //Material replication 1.2.2
 
     // Soft Dependencies
     implementation "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.684"
     compileOnlyApi rfg.deobf("curse.maven:ctm-267602:2915363") // CTM 1.0.2.31
     compileOnlyApi rfg.deobf("curse.maven:ae2-extended-life-570458:5147702") // AE2UEL 0.56.4
+    compileOnlyApi rfg.deobf("curse.maven:modularui-624243:5153413")
+    api("com.cleanroommc:modularui:2.4.3")
 }

gradle.properties

@@ -7,7 +7,7 @@ modGroup = com.fulltrix.gcyl
 
 # Version of your mod.
 # This field can be left empty if you want your mod's version to be determined by the latest git tag instead.
-modVersion = 0.0.4
+modVersion = 0.0.5
 
 # Whether to use the old jar naming structure (modid-mcversion-version) instead of the new version (modid-version)
 includeMCVersionJar = false

src/main/java/com/fulltrix/gcyl/CommonProxy.java

@@ -1,13 +1,17 @@
 package com.fulltrix.gcyl;
 
 import com.fulltrix.gcyl.item.GCYLCoreItems;
+import com.fulltrix.gcyl.materials.GCYLMaterialOverride;
+import com.fulltrix.gcyl.materials.GCYLMaterials;
+import com.fulltrix.gcyl.materials.GCYLNuclearMaterials;
 import com.fulltrix.gcyl.recipes.RecipeHandler;
 import com.fulltrix.gcyl.recipes.GCYLRecipeMaps;
 import com.fulltrix.gcyl.recipes.categories.handlers.ElectricImplosionHandler;
 import com.fulltrix.gcyl.recipes.categories.handlers.FuelHandler;
 import com.fulltrix.gcyl.recipes.categories.handlers.VoidMinerHandler;
 import com.fulltrix.gcyl.recipes.helper.GCYLComponents;
 import com.fulltrix.gcyl.recipes.recipeproperties.AdvFusionCoilProperty;
+import com.fulltrix.gcyl.worldgen.WorldGenRegister;
 import gregicality.multiblocks.common.GCYMConfigHolder;
 import gregtech.api.GregTechAPI;
 import gregtech.api.block.VariantItemBlock;
@@ -16,7 +20,6 @@
 import gregtech.api.recipes.recipeproperties.FusionEUToStartProperty;
 import gregtech.api.unification.material.event.MaterialEvent;
 import gregtech.api.unification.material.event.MaterialRegistryEvent;
-import gregtech.common.ConfigHolder;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
@@ -28,7 +31,6 @@
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.client.event.ConfigChangedEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.Event;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.registries.IForgeRegistry;
@@ -50,6 +52,7 @@ private static void registerRecipesAfterCT() {
 
     public void onLoad() throws IOException {
         registerRecipesAfterCT();
+        WorldGenRegister.init();
     }
 
     @SubscribeEvent(priority = EventPriority.HIGH)
@@ -66,11 +69,14 @@ public static void forceHighTierConfig(HighTierEvent event) {
     @SubscribeEvent(priority = EventPriority.NORMAL)
     public static void registerMaterials(MaterialEvent event) {
         //TJFMaterials.registerNuclearMaterials();
+        GCYLNuclearMaterials.registerNuclear();
         GCYLMaterials.register();
         GCYLMaterials.register2();
         GCYLMaterials.registerSuperconductors();
-        GCYLMaterials.materialChanges();
-        GCYLMaterials.tempMaterialModifications();
+        GCYLMaterials.initDEMaterials();
+
+        GCYLMaterialOverride.materialChanges();
+        GCYLMaterialOverride.tempMaterialModifications();
     }
 
     @SubscribeEvent

src/main/java/com/fulltrix/gcyl/GCYLConfig.java

@@ -104,7 +104,7 @@ public static class Misc {
 
         @Config.Comment("List of Soldering fluid [<fluid>:<amount>] amount=[1 ~ 64000]")
         @Config.RequiresMcRestart
-        public String[] solderingFluidList = new String[]{"soldering_alloy:72", "tin:144", "lead:288"};
+        public String[] solderingFluidList = new String[]{"soldering_alloy:72", "tin:144", "lead:288", "indalloy_140:36"};
 
         @Config.Comment({"Whether to enable Magneto Resonatic Circuits. When false, they will have no recipes and will be hidden from JEI.", "default = true"})
         @Config.Name("Enable Magneto Circuits")

src/main/java/com/fulltrix/gcyl/client/ClientHandler.java

@@ -28,6 +28,9 @@ public class ClientHandler {
     public static SimpleOverlayRenderer ADVANCED_FUSION;
     public static SimpleOverlayRenderer ADVANCED_FUSION_ACTIVE;
     public static SimpleOverlayRenderer NITINOL_60_CASING;
+    public static SimpleOverlayRenderer HASTELLOY_K243_CASING;
+    public static SimpleOverlayRenderer MAINTENANCE_OVERLAY_STERILE_CLEANING;
+    public static SimpleOverlayRenderer CLADDED_REACTOR_CASING;
 
     public static OrientedOverlayRenderer NAQADAH_OVERLAY;
     public static OrientedOverlayRenderer ROCKET_OVERLAY;
@@ -51,6 +54,8 @@ public static void preInit() {
 
         FREEZER_OVERLAY = new OrientedOverlayRenderer("machines/freezer");
 
+        MAINTENANCE_OVERLAY_STERILE_CLEANING = new SimpleOverlayRenderer("overlay/machine/overlay_maintenance_sterile_cleaning");
+
         //MetaCasing1
         STABALLOY_CASING = new SimpleOverlayRenderer("casings/metal_casings/staballoy");
         QUANTUM_CASING = new SimpleOverlayRenderer("casings/metal_casings/quantum");
@@ -61,10 +66,12 @@ public static void preInit() {
         HASTELLOY_N_CASING = new SimpleOverlayRenderer("casings/metal_casings/hastelloy_n");
         INCOLOY_813_CASING = new SimpleOverlayRenderer("casings/metal_casings/incoloy_813");
         NITINOL_60_CASING = new SimpleOverlayRenderer("casings/metal_casings/nitinol_60");
+        HASTELLOY_K243_CASING = new SimpleOverlayRenderer("casings/metal_casings/hastelloy_k243");
 
         ENRICHED_NAQUADAH_ALLOY_CASING = new SimpleOverlayRenderer("casings/metal_casings/enriched_naquadah_alloy");
         NAQUADRIA_CASING = new SimpleOverlayRenderer("casings/metal_casings/naquadria");
         HYPER_CASING = new SimpleOverlayRenderer("casings/solid/hyper_casing");
         HYPER_CASING_2 = new SimpleOverlayRenderer("casings/solid/hyper_casing_2");
+        CLADDED_REACTOR_CASING = new SimpleOverlayRenderer("casings/solid/cladded_reactor_casing");
     }
 }

src/main/java/com/fulltrix/gcyl/item/GCYLCoreItem.java

@@ -1,5 +1,6 @@
 package com.fulltrix.gcyl.item;
 
+import com.fulltrix.gcyl.item.behaviors.MinerDataItemBehavior;
 import gregtech.api.items.metaitem.StandardMetaItem;
 import gregtech.api.unification.material.MarkerMaterials;
 import gregtech.api.unification.material.MarkerMaterials.Tier;
@@ -365,7 +366,11 @@ public void registerSubItems() {
         PROTONATED_FULLERENE_SIEVING_MATRIX = addItem(609, "protonated.fullerene.sieving.matrix");
         SATURATED_FULLERENE_SIEVING_MATRIX =addItem(610, "saturated.fullerene.sieving.matrix");
 
-        TOOL_DATA_SUPRACAUSAL = addItem(615, "tool.datasupracausal").addComponents(new DataItemBehavior(true));
+        TOOL_DATA_MODULE_CLUSTER = addItem(613, "tool.data.module_cluster").addComponents(new DataItemBehavior(true));
+        TOOL_DATA_ULTIMATE = addItem(614, "tool.data.ultimate").addComponents(new DataItemBehavior(true));
+        TOOL_DATA_SUPRACAUSAL = addItem(615, "tool.data.supracausal").addComponents(new DataItemBehavior(true));
+
+        TOOL_DATA_DEEP_MINER = addItem(616, "tool.data.deep_miner").addComponents(new MinerDataItemBehavior(false));
 
         PYROLYTIC_CARBON = addItem(16, "pyrolytic_carbon");
         MICA_SHEET = addItem(26, "mica_sheet");

src/main/java/com/fulltrix/gcyl/item/GCYLCoreItems.java

@@ -392,15 +392,6 @@ public class GCYLCoreItems {
     public static MetaItem<?>.MetaValueItem ROD_FIELD_SHAPE;
 
 
-    // monitor
-    public static MetaItem<?>.MetaValueItem COVER_DIGITAL_INTERFACE;
-    public static MetaItem<?>.MetaValueItem PLUGIN_TEXT;
-    public static MetaItem<?>.MetaValueItem PLUGIN_ONLINE_PIC;
-    public static MetaItem<?>.MetaValueItem PLUGIN_FAKE_GUI;
-    public static MetaItem<?>.MetaValueItem PLUGIN_ADVANCED_MONITOR;
-
-
-
     public static MetaItem<?>.MetaValueItem COLOURED_LEDS;
     public static MetaItem<?>.MetaValueItem DISPLAY;
 
@@ -434,7 +425,13 @@ public class GCYLCoreItems {
     public static MetaItem<?>.MetaValueItem PROTONATED_FULLERENE_SIEVING_MATRIX;
     public static MetaItem<?>.MetaValueItem SATURATED_FULLERENE_SIEVING_MATRIX;
 
+    public static MetaItem<?>.MetaValueItem TOOL_DATA_MODULE_CLUSTER;
+    public static MetaItem<?>.MetaValueItem TOOL_DATA_ULTIMATE;
     public static MetaItem<?>.MetaValueItem TOOL_DATA_SUPRACAUSAL;
+    public static MetaItem<?>.MetaValueItem TOOL_DATA_DEEP_MINER;
+    public static MetaItem<?>.MetaValueItem TOOL_DATA_DEEP_MINER_MODULE;
+    public static MetaItem<?>.MetaValueItem TOOL_DATA_DEEP_MINER_COMPLEX;
+
 
     public static void init() {
         GCYLCoreItem item = new GCYLCoreItem();

src/main/java/com/fulltrix/gcyl/item/GCYLHeatingCoil.java

@@ -1,6 +1,6 @@
 package com.fulltrix.gcyl.item;
 
-import com.fulltrix.gcyl.GCYLMaterials;
+import com.fulltrix.gcyl.materials.GCYLMaterials;
 import gregtech.api.block.IHeatingCoilBlockStats;
 import gregtech.api.block.VariantActiveBlock;
 import gregtech.api.block.VariantItemBlock;

src/main/java/com/fulltrix/gcyl/item/GCYLMetaBlocks.java

@@ -27,7 +27,6 @@ public class GCYLMetaBlocks {
     public static GCYLExplosive EXPLOSIVE;
     public static GCYLSimpleBlock SIMPLE_BLOCK;
     public static GCYLReactorCasing REACTOR_CASING;
-
     public static MetalCasing1 METAL_CASING_1;
     public static MetalCasing2 METAL_CASING_2;
 

src/main/java/com/fulltrix/gcyl/item/GCYLReactorCasing.java

@@ -32,7 +32,8 @@ public enum CasingType implements IStringSerializable {
         HYPER_CORE_2("hyper_core_2"),
         HYPER_CORE_3("hyper_core_3"),
         HYPER_CASING("hyper_casing"),
-        HYPER_CASING_2("hyper_casing_2");
+        HYPER_CASING_2("hyper_casing_2"),
+        CLADDED_REACTOR_CASING("cladded_reactor_casing");
 
 
         private final String name;

src/main/java/com/fulltrix/gcyl/item/behaviors/MinerDataItemBehavior.java

@@ -0,0 +1,38 @@
+package com.fulltrix.gcyl.item.behaviors;
+
+import com.fulltrix.gcyl.recipes.GCYLRecipeMaps;
+import com.fulltrix.gcyl.recipes.categories.DeepMinerRecipes;
+import gregtech.api.items.metaitem.stats.IDataItem;
+import gregtech.api.items.metaitem.stats.IItemBehaviour;
+import gregtech.api.recipes.Recipe;
+import gregtech.api.recipes.RecipeMap;
+import gregtech.api.recipes.machines.IResearchRecipeMap;
+import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.item.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.List;
+
+public class MinerDataItemBehavior implements IItemBehaviour, IDataItem {
+
+    private final boolean requireDataBank;
+
+    public MinerDataItemBehavior() {
+        this.requireDataBank = false;
+    }
+
+    public MinerDataItemBehavior(boolean requireDataBank) {this.requireDataBank = requireDataBank;}
+
+    @Override
+    public boolean requireDataBank() { return requireDataBank; }
+
+    @Override
+    public void addInformation(@NotNull ItemStack itemStack, List<String> lines) {
+        String researchId = DeepMinerRecipes.readResearchId(itemStack);
+        if (researchId == null) return;
+        lines.add(I18n.format("gcyl.research."+researchId+".tooltip"));
+    }
+
+}

src/main/java/com/fulltrix/gcyl/item/metal/MetalCasing1.java

@@ -14,7 +14,7 @@
 
 import javax.annotation.Nonnull;
 
-import static com.fulltrix.gcyl.GCYLMaterials.*;
+import static com.fulltrix.gcyl.materials.GCYLMaterials.*;
 import static com.fulltrix.gcyl.client.ClientHandler.*;
 
 public class MetalCasing1 extends VariantBlock<MetalCasing1.CasingType> {
@@ -39,7 +39,10 @@ public enum CasingType implements IStringSerializable {
         HASTELLOY_X78("casing_hastelloy_x78", HastelloyX78),
         HASTELLOY_N("casing_hastelloy_n", HastelloyN),
         NITINOL_60("casing_nitinol_60", Nitinol60),
-        INCOLOY_813("casing_incoloy_813", Incoloy813);
+        INCOLOY_813("casing_incoloy_813", Incoloy813),
+        HASTELLOY_K243("casing_hastelloy_k243", HastelloyK243);
+
+
 
         private final String name;
         private final Material material;
@@ -72,6 +75,9 @@ public ICubeRenderer getTexture() {
                 case "casing_nitinol_60" -> {
                     return NITINOL_60_CASING;
                 }
+                case "casing_hastelloy_k243" -> {
+                    return HASTELLOY_K243_CASING;
+                }
                 default -> {
                     return HASTELLOY_X78_CASING;
                 }

src/main/java/com/fulltrix/gcyl/item/metal/MetalCasing2.java

@@ -7,7 +7,7 @@
 import net.minecraft.util.IStringSerializable;
 import org.jetbrains.annotations.NotNull;
 
-import static com.fulltrix.gcyl.GCYLMaterials.*;
+import static com.fulltrix.gcyl.materials.GCYLMaterials.*;
 import static com.fulltrix.gcyl.client.ClientHandler.*;
 import static gregtech.api.unification.material.Materials.*;
 

src/main/java/com/fulltrix/gcyl/machines/GCYLTileEntities.java

@@ -8,8 +8,12 @@
 import com.fulltrix.gcyl.machines.multi.MetaTileEntityElectricImplosion;
 import com.fulltrix.gcyl.machines.multi.MetaTileEntityStellarForge;
 import com.fulltrix.gcyl.machines.multi.advance.*;
+import com.fulltrix.gcyl.machines.multi.miner.MetaTileEntityDeepMiner;
 import com.fulltrix.gcyl.machines.multi.miner.MetaTileEntityVoidMiner;
+import com.fulltrix.gcyl.machines.multi.multiblockpart.MetaTileEntitySterileCleaningMaintenanceHatch;
 import com.fulltrix.gcyl.machines.multi.simple.MetaTileEntityChemicalPlant;
+import com.fulltrix.gcyl.machines.multi.simple.MetaTileEntityDecayChamber;
+import com.fulltrix.gcyl.machines.multi.simple.MetaTileEntityGreenhouse;
 import com.fulltrix.gcyl.machines.multi.simple.MetaTileEntityPlasmaCondenser;
 import com.fulltrix.gcyl.recipes.GCYLRecipeMaps;
 import gregtech.api.GTValues;
@@ -22,6 +26,8 @@
 import net.minecraft.util.ResourceLocation;
 
 import static com.fulltrix.gcyl.GCYLUtility.gcylId;
+import static com.fulltrix.gcyl.recipes.GCYLRecipeMaps.DEEP_MINER_RECIPES;
+import static gregtech.api.util.GTUtility.gregtechId;
 import static gregtech.common.metatileentities.MetaTileEntities.registerMetaTileEntity;
 
 public class GCYLTileEntities {
@@ -41,6 +47,12 @@ public class GCYLTileEntities {
     public static MetaTileEntityChemicalPlant CHEMICAL_PLANT;
     public static MetaTileEntityLargeRocketEngine LARGE_ROCKET_ENGINE;
     public static MetaTileEntityCryogenicFreezer CRYOGENIC_FREEZER;
+    public static MetaTileEntityOreFactory ORE_FACTORY;
+    public static MetaTileEntityDeepMiner DEEP_MINER;
+    public static MetaTileEntityDecayChamber DECAY_CHAMBER;
+    public static MetaTileEntityGreenhouse[] GREEN_HOUSE = new MetaTileEntityGreenhouse[2];
+
+    public static MetaTileEntitySterileCleaningMaintenanceHatch STERILE_CLEANING_MAINTENANCE_HATCH;
 
     public static SimpleGeneratorMetaTileEntity[] NAQUADAH_REACTOR = new SimpleGeneratorMetaTileEntity[8];
     public static SimpleGeneratorMetaTileEntity[] ROCKET_GENERATOR = new SimpleGeneratorMetaTileEntity[8];
@@ -93,6 +105,16 @@ public static void init() {
 
         CRYOGENIC_FREEZER = registerMetaTileEntity(++id, new MetaTileEntityCryogenicFreezer(gcylId("cryogenic_freezer")));
 
+        ORE_FACTORY = registerMetaTileEntity(++id, new MetaTileEntityOreFactory(gcylId("ore_factory")));
+
+        DEEP_MINER = registerMetaTileEntity(++id, new MetaTileEntityDeepMiner(gcylId("deep_miner"), DEEP_MINER_RECIPES, false));
+
+        STERILE_CLEANING_MAINTENANCE_HATCH = registerMetaTileEntity(++id, new MetaTileEntitySterileCleaningMaintenanceHatch(gcylId("maintenance_hatch_sterile_cleanroom_auto")));
+
+        DECAY_CHAMBER = registerMetaTileEntity(++id, new MetaTileEntityDecayChamber(gcylId("decay_chamber"), true));
+
+        GREEN_HOUSE[0] = registerMetaTileEntity(++id, new MetaTileEntityGreenhouse(gcylId("greenhouse_mv"), 2));
+        GREEN_HOUSE[1] = registerMetaTileEntity(++id, new MetaTileEntityGreenhouse(gcylId("greenhouse_uv"), 8));
         //TODO: configurable efficiency for naq reactors, efficiency implementation in general
 
         /*

src/main/java/com/fulltrix/gcyl/machines/multi/MetaTileEntityBioReactor.java

@@ -34,7 +34,7 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity iGregTechTileEnti
     public long maxVoltage = 0;
 
     @Override
-    protected BlockPattern createStructurePattern() { //TODO: overhaul bioreactor mechanics in an overhaul pr
+    protected BlockPattern createStructurePattern() { //TODO: add tiered casings
         return FactoryBlockPattern.start()
                 .aisle("XXXXX", "XGGGX", "XGGGX", "XGGGX", "XXXXX")
                 .aisle("XXXXX", "G###G", "G###G", "G###G", "XXXXX")

src/main/java/com/fulltrix/gcyl/machines/multi/MetaTileEntityCosmicRayDetector.java

@@ -3,7 +3,7 @@
 import codechicken.lib.render.CCRenderState;
 import codechicken.lib.render.pipeline.IVertexOperation;
 import codechicken.lib.vec.Matrix4;
-import com.fulltrix.gcyl.GCYLMaterials;
+import com.fulltrix.gcyl.materials.GCYLMaterials;
 import com.fulltrix.gcyl.client.ClientHandler;
 import com.fulltrix.gcyl.item.metal.MetalCasing2;
 import com.google.common.collect.Lists;
@@ -48,7 +48,7 @@
 import javax.annotation.Nullable;
 import java.util.List;
 
-import static com.fulltrix.gcyl.GCYLMaterials.BlackTitanium;
+import static com.fulltrix.gcyl.materials.GCYLMaterials.BlackTitanium;
 import static com.fulltrix.gcyl.client.ClientHandler.QUANTUM_CASING;
 import static com.fulltrix.gcyl.item.GCYLMetaBlocks.METAL_CASING_2;
 

src/main/java/com/fulltrix/gcyl/machines/multi/advance/MetaTileEntityAdvFusionReactor.java

@@ -44,7 +44,6 @@
 import gregtech.client.utils.*;
 import gregtech.common.ConfigHolder;
 import gregtech.common.metatileentities.MetaTileEntities;
-import gregtech.common.metatileentities.multi.electric.MetaTileEntityFusionReactor;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.GlStateManager;
@@ -73,7 +72,7 @@
 import java.util.List;
 import java.util.function.DoubleSupplier;
 
-import static com.fulltrix.gcyl.GCYLMaterials.*;
+import static com.fulltrix.gcyl.materials.GCYLMaterials.*;
 
 public class MetaTileEntityAdvFusionReactor extends RecipeMapMultiblockController implements ITieredMetaTileEntity, IFastRenderMetaTileEntity, IBloomEffect {
 
@@ -553,7 +552,7 @@ public void renderBloomEffect(@NotNull BufferBuilder buffer, @NotNull EffectRend
     @Override
     @SideOnly(Side.CLIENT)
     public boolean shouldRenderBloomEffect(@NotNull EffectRenderContext context) {
-        return this.hasFusionRingColor() && context.camera().isBoundingBoxInFrustum(getRenderBoundingBox());
+        return this.hasFusionRingColor();
     }
 
     @Override