aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2024-07-20 15:35:26 +0100
committerGitHub <noreply@github.com>2024-07-20 21:35:26 +0700
commit8b077c28bea7bcc046be1e4b8485d69b4c245a43 (patch)
tree8601728fda54a11c894fa0a5533672ca40023af8 /src/main
parenta33bca92fbf9ec0a1d7f42f5a1a08b807739007c (diff)
downloadGT5-Unofficial-8b077c28bea7bcc046be1e4b8485d69b4c245a43.tar.gz
GT5-Unofficial-8b077c28bea7bcc046be1e4b8485d69b4c245a43.tar.bz2
GT5-Unofficial-8b077c28bea7bcc046be1e4b8485d69b4c245a43.zip
Beamline (#2619)
* Beamline * Remove hardcoded dreamcraft items and spotless * Remove logs and fix auto structure check * Remove logs and fix auto structure check * Fix typo and synchrotron high MF scaling * sa (cherry picked from commit b2796d95538a1b683b4a98bf6cb0f8fe21404fbd) * Add multi textures, add structuredesc info, remove test TC input, add synchrotron/input/output recipes * Spotless * Prevent mob spawning on casings * Fix LINAC glass requirement, make synchrotron structure less ugly, add last recipe * Spotless * Add placeholder particle textures * Add some mask recipes I missed * Spotless apply for branch lanth-beamline for #2619 (#2630) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Add further error messages to LINAC and Synchrotron, fix MM & LaB6 recipes * Spotless apply for branch lanth-beamline for #2619 (#2648) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Minor changes, add more multi error messages & 9x U-238 SC recipe * Spotless apply for branch lanth-beamline for #2619 (#2651) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Missed a change * Spotless apply for branch lanth-beamline for #2619 (#2652) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Update beamline desc * Remove comments, move coolant fluid check to Util class * Spotless * Spotless apply for branch lanth-beamline for #2619 (#2666) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Fix Mu-Metal recipe output amount, tool stats for MM & LaB6 * Spotless * Fix multi hatch textures * Spotless apply for branch lanth-beamline for #2619 (#2676) spotlessApply Co-authored-by: GitHub GTNH Actions <> * Increase Synchrotron output rate eut & antenna tier scaling, in general improve output rates, buff all TC recipes' processing time * Fix misleading BL tooltip * update * remove import * Buff higher-tier wafer recipes for each IC, from a 4x to 3x increase of recipe amount per two wafer tier increases * Remove RA1 calls in beamline (#2716) * Spotless apply for branch lanth-beamline for #2619 (#2717) spotlessApply Co-authored-by: GitHub GTNH Actions <> * fix * Spotless apply for branch lanth-beamline for #2619 (#2733) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: unknown <gtandemmodding@gmail.com> Co-authored-by: Elisis <jarrad.thomson@gmail.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java53
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/beamline/BeamInformation.java51
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/beamline/BeamLinePacket.java51
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/beamline/IConnectsToBeamline.java14
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/beamline/Particle.java71
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/beamline/TileBeamline.java256
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/block/AntennaCasing.java15
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/block/Casing.java80
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/block/ShieldedAccGlass.java68
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/hatch/TileBusInputFocus.java85
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/hatch/TileHatchBeamlineConnector.java136
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/hatch/TileHatchInputBeamline.java131
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/hatch/TileHatchOutputBeamline.java138
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/item/ICanFocus.java5
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/item/LanthItem.java15
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/item/MaskList.java147
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/item/ParticleItem.java124
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/item/PhotolithographicMask.java38
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java157
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java174
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/LINAC.java729
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/SourceChamber.java412
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/Synchrotron.java1068
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/TargetChamber.java479
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeAdder2.java166
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/recipe/beamline/BeamlineRecipeLoader.java191
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/recipe/beamline/RecipeSC.java53
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/recipe/beamline/RecipeTC.java72
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/recipe/beamline/SourceChamberFrontend.java24
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/recipe/beamline/TargetChamberFrontend.java109
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java13
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java766
-rw-r--r--src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java16
-rw-r--r--src/main/java/com/elisis/gtnhlanth/util/Util.java55
-rw-r--r--src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java1
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java19
-rw-r--r--src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java5
-rw-r--r--src/main/java/goodgenerator/loader/NeutronActivatorLoader.java7
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java3
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java2
-rw-r--r--src/main/java/gregtech/api/util/GT_Multiblock_Tooltip_Builder.java14
-rw-r--r--src/main/java/gregtech/common/blocks/GT_Block_Casings5.java2
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multiblock/LayeredCokeBattery.java9
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BI_CONN.pngbin0 -> 1166 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/BO_CONN.pngbin0 -> 1166 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_SHIELDED_ACCELERATOR.pngbin0 -> 696 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BI_ACTIVE.pngbin0 -> 2206 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BI_ACTIVE.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BI_SIDES.pngbin0 -> 4286 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BI_SIDES.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BO_ACTIVE.pngbin0 -> 2206 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BO_ACTIVE.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BO_SIDES.pngbin0 -> 4286 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_BO_SIDES.png.mcmeta5
-rw-r--r--src/main/resources/assets/gregtech/textures/blocks/iconsets/pipe.pngbin0 -> 1166 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/lang/en_US.lang111
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/blocks/casing.antenna_t1.pngbin0 -> 4354 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/blocks/casing.antenna_t2.pngbin0 -> 645 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/blocks/casing.coolant_delivery.pngbin0 -> 684 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/blocks/casing.electrode.pngbin0 -> 599 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/blocks/casing.focus_holder.pngbin0 -> 978 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/blocks/casing.focus_manipulator.pngbin0 -> 799 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/blocks/casing.shielded_accelerator.pngbin0 -> 696 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/blocks/casing.shielded_accelerator_glass.pngbin0 -> 607 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/blocks/casing.target_holder.pngbin0 -> 898 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/blocks/casing.target_receptacle.pngbin0 -> 719 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/capillary_exchange.pngbin0 -> 812 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/etched_mask1.pngbin0 -> 769 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/iron_quartz_plate.pngbin0 -> 876 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/mask_substrate.pngbin0 -> 614 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/masked_mask_substrate.pngbin0 -> 694 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/mm_lattice.pngbin0 -> 652 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/particle/alpha.pngbin0 -> 1243 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/particle/electron.pngbin0 -> 1180 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/particle/neutron.pngbin0 -> 1169 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/particle/photon.pngbin0 -> 1089 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/particle/proton.pngbin0 -> 1331 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/asoc.pngbin0 -> 1977 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/blank1.pngbin0 -> 910 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/blank2.pngbin0 -> 910 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/blank3.pngbin0 -> 910 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/cpu.pngbin0 -> 1862 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/hpic.pngbin0 -> 2069 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/ilc.pngbin0 -> 1757 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/lpic.pngbin0 -> 2051 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/nand.pngbin0 -> 1603 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/ncpu.pngbin0 -> 2047 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/nor.pngbin0 -> 1674 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/npic.pngbin0 -> 2071 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/pic.pngbin0 -> 2012 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/ppic.pngbin0 -> 2054 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/qbit.pngbin0 -> 2019 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/qpic.pngbin0 -> 2062 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/ram.pngbin0 -> 1758 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/soc.pngbin0 -> 2063 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/ssoc.pngbin0 -> 2194 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/uhpic.pngbin0 -> 2069 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/photomask/ulpic.pngbin0 -> 2035 bytes
-rw-r--r--src/main/resources/assets/gtnhlanth/textures/items/substrate_precursor.pngbin0 -> 621 bytes
99 files changed, 6096 insertions, 59 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
index 275e8ae107..8ffdc0b5a1 100644
--- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
+++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
@@ -1,18 +1,15 @@
package com.elisis.gtnhlanth;
-import java.util.Arrays;
import java.util.logging.Logger;
-import net.minecraftforge.oredict.OreDictionary;
-
import com.elisis.gtnhlanth.common.CommonProxy;
import com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool;
import com.elisis.gtnhlanth.common.register.LanthItemList;
import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool;
+import com.elisis.gtnhlanth.common.tileentity.recipe.beamline.BeamlineRecipeLoader;
import com.elisis.gtnhlanth.loader.BotRecipes;
import com.elisis.gtnhlanth.loader.RecipeLoader;
import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry;
-import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
@@ -21,8 +18,6 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_Log;
@Mod(
modid = Tags.MODID,
@@ -46,9 +41,13 @@ public class GTNHLanthanides {
@EventHandler
public static void preInit(FMLPreInitializationEvent e) {
+
WerkstoffAdderRegistry.addWerkstoffAdder(new WerkstoffMaterialPool());
WerkstoffAdderRegistry.addWerkstoffAdder(new BotWerkstoffMaterialPool());
- LanthItemList.register();
+
+ LanthItemList.registerTypical();
+ LanthItemList.registerGTMTE();
+
// GregTech_API.sAfterGTPostload.add(new ZPMRubberChanges());
proxy.preInit(e);
}
@@ -61,37 +60,45 @@ public class GTNHLanthanides {
@EventHandler
public static void postInit(FMLPostInitializationEvent e) {
+
RecipeLoader.loadGeneral();
RecipeLoader.loadLanthanideRecipes();
RecipeLoader.addRandomChemCrafting();
+ RecipeLoader.loadAccelerator();
+
+ BeamlineRecipeLoader.load();
+
BotRecipes.addGTRecipe();
// RecipeLoader.loadZylonRecipes();
proxy.postInit(e);
// GT_Log.out.print(FluidRegistry.getFluid("Sodium Tungstate").getName());
- GT_Log.out.print(
- Arrays.toString(
- Werkstoff.werkstoffNameHashMap.keySet()
- .toArray()));
- GT_Log.out.print(
- Arrays.toString(
- Werkstoff.werkstoffHashMap.keySet()
- .toArray()));
-
- GT_Log.out.print(
- "HMMM " + Arrays.toString(
- OreDictionary
- .getOreIDs(WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1))));
+ // GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffNameHashMap.keySet().toArray()));
+ // GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffHashMap.keySet().toArray()));
+
+ /*
+ * GT_Log.out.print("HMMM " + Arrays.toString(OreDictionary.getOreIDs(
+ * WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1))));
+ */
}
@EventHandler
public static void onModLoadingComplete(FMLLoadCompleteEvent e) {
- GT_Log.out.print("AAAAAAAAAAAAAA");
+ // GT_Log.out.print("AAAAAAAAAAAAAA " + new
+ // ItemStack(LanthItemList.maskMap.get(MaskList.CPU)).getUnlocalizedName());
//
- GT_Log.out.print("We are done loading");
+ // GT_Log.out.print("We are done loading");
BotRecipes.removeRecipes();
RecipeLoader.removeCeriumSources();
- GT_Log.out.print("blah blah " + WerkstoffMaterialPool.PTMEGElastomer.hasGenerationFeature(OrePrefixes.ingot));
+ /*
+ * for (GT_ItemStack stack : BeamlineRecipeAdder.instance.TargetChamberRecipes.mRecipeItemMap.keySet()) {
+ * GT_Log.out.print(" Recipes for: " + stack.mItem.getUnlocalizedName() + ": "); for (GT_Recipe recipe :
+ * BeamlineRecipeAdder.instance.TargetChamberRecipes.mRecipeItemMap.get(stack)) {
+ * GT_Log.out.print(Arrays.toString(recipe.mOutputs)); } }
+ */
+
+ // GT_Log.out.print("blah blah " +
+ // WerkstoffMaterialPool.PTMEGElastomer.hasGenerationFeature(OrePrefixes.ingot));
}
}
diff --git a/src/main/java/com/elisis/gtnhlanth/common/beamline/BeamInformation.java b/src/main/java/com/elisis/gtnhlanth/common/beamline/BeamInformation.java
new file mode 100644
index 0000000000..9c10703c2e
--- /dev/null
+++ b/src/main/java/com/elisis/gtnhlanth/common/beamline/BeamInformation.java
@@ -0,0 +1,51 @@
+package com.elisis.gtnhlanth.common.beamline;
+
+public class BeamInformation {
+
+ private float energy; // in keV
+ private int rate;
+
+ private Particle particle;
+ private int particleId;
+
+ private float focus;
+
+ public BeamInformation(float energy, int rate, int particleId, float focus) {
+ this.energy = energy;
+ this.rate = rate;
+ this.particleId = particleId;
+ this.particle = Particle.values()[particleId];
+ this.focus = focus;
+ }
+
+ public float getEnergy() {
+ return this.energy;
+ }
+
+ public int getRate() {
+ return this.rate;
+ }
+
+ public Particle getParticle() {
+ return this.particle;
+ }
+
+ public int getParticleId() {
+ return this.particleId;
+ }
+
+ public float getFocus() {
+ return this.focus;
+ }
+
+ @Override
+ public String toString() {
+ return "Energy=" + this.getEnergy()
+ + ",Rate="
+ + this.getRate()
+ + ",Particle="
+ + this.getParticleId()
+ + ",Focus="
+ + this.getFocus();
+ }
+}
diff --git a/src/main/java/com/elisis/gtnhlanth/common/beamline/BeamLinePacket.java b/src/main/java/com/elisis/gtnhlanth/common/beamline/BeamLinePacket.java
new file mode 100644
index 0000000000..bbd712a9b0
--- /dev/null
+++ b/src/main/java/com/elisis/gtnhlanth/common/beamline/BeamLinePacket.java
@@ -0,0 +1,51 @@
+package com.elisis.gtnhlanth.common.beamline;
+
+import net.minecraft.nbt.NBTTagCompound;
+
+import com.github.technus.tectech.mechanics.dataTransport.DataPacket;
+
+public class BeamLinePacket extends DataPacket<BeamInformation> {
+
+ public BeamLinePacket(BeamInformation content) {
+ super(content);
+ }
+
+ public BeamLinePacket(NBTTagCompound compound) {
+ super(compound);
+ }
+
+ @Override
+ protected BeamInformation contentFromNBT(NBTTagCompound nbt) {
+ /*
+ * NBTTagCompound compound = nbt.getCompoundTag("beamline");
+ */
+ return new BeamInformation(
+ nbt.getFloat("energy"),
+ nbt.getInteger("rate"),
+ nbt.getInteger("particleId"),
+ nbt.getInteger("focus"));
+ }
+
+ @Override
+ protected NBTTagCompound contentToNBT() {
+
+ NBTTagCompound compound = new NBTTagCompound();
+
+ compound.setFloat("energy", content.getEnergy());
+ compound.setInteger("rate", content.getRate());
+ compound.setInteger("particleId", content.getParticleId());
+ compound.setFloat("focus", content.getFocus());
+
+ return compound;
+ }
+
+ @Override
+ public boolean extraCheck() {
+ return true;
+ }
+
+ @Override
+ protected BeamInformation unifyContentWith(BeamInformation arg0) {
+ throw new NoSuchMethodError("Unavailable to unify beam info data packet");
+ }
+}
diff --git a/src/main/java/com/elisis/gtnhlanth/common/beamline/ICo