aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core
diff options
context:
space:
mode:
authorMaxim <maxim235@gmx.de>2023-07-22 16:12:12 +0200
committerGitHub <noreply@github.com>2023-07-22 16:12:12 +0200
commit2b424e8295b7071b85a2960a87da91bf0dd3df02 (patch)
tree8ac7f89be7193dd0fe8e9b7b2919924fae34e860 /src/main/java/gtPlusPlus/core
parentdd025431efe8122bc316bc2f1b99a939c0ca149a (diff)
downloadGT5-Unofficial-2b424e8295b7071b85a2960a87da91bf0dd3df02.tar.gz
GT5-Unofficial-2b424e8295b7071b85a2960a87da91bf0dd3df02.tar.bz2
GT5-Unofficial-2b424e8295b7071b85a2960a87da91bf0dd3df02.zip
Implement generic processing logic (#697)
* Migrated extruder * Migrated alloy smelter * Migrated arc furnace * Migrated centrifuge * Migrated ICO * Migrated cutter * Migrated dehydrator * Migrated electrolyzer * Migrated fluid heater * Migrated forge hammer * Forgot gtpp machines are cursed * Migrated mac * Migrated mixer * Migrated molecular transformer * Migrated bender * Migrated sifter * Migrated thermal centrifuge * Migrated VF * Migrated washer * Migrated wiremill * Migrated Volcanus * Migrated adv implo compressor * Migrated XL turbines * Migrated chemplant * Migrated MABS * Migrated ABS * Migrated cyclotron * Migrated Zhuhai * Migrated rock breaker * Migrated rocketdyne * Migrated semifluid generator * Migrated QFT * Minor optimization * Migrate refinery * Migrated solar tower * Migrated TGS * Migrated duplicator * Migrated PSS * Migrated algae pond * Migrated froth flotation cell * Migrated LTFR * Migrated LPF * Migrated sparge tower * Migrated salt * Migrated isamill * Migrate DT * Migrated HE * Migrated mass fab * Migrated chisel * Migrated boiler * Migrated steam machines * Migrated amazon * Disable batch mode button on XL turbines * Update dependencies.gradle * Updated dep * Addressed first batch of reviews * Migrated assembler * Removed unused checkRecipe methods * Forgot these * Fix and cleanup chemplant * Removed getAmounfOfOutputs * Removed special multi behavior * Migrated sound mostly * Addressed new reviews * Fix build fail and chisel sound * Derp * More reviews addressed * Oversight on chemplant batchmode * Fix DT speed bonus * Removed iron blast furnace * Removed generator array * Removed * Simplify rocket engine logic * Removed left over artifacts * Minor fixes * Removed nerf chips * Removed tesla tower * Revert and fix chemplant recipe map * Fix chemplant catalyst damaging * Addressed reviews * Derp --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/core')
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java167
-rw-r--r--src/main/java/gtPlusPlus/core/config/ConfigHandler.java3
-rw-r--r--src/main/java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java180
-rw-r--r--src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java14
-rw-r--r--src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java6
-rw-r--r--src/main/java/gtPlusPlus/core/lib/CORE.java1
-rw-r--r--src/main/java/gtPlusPlus/core/proxy/ClientProxy.java3
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java59
8 files changed, 0 insertions, 433 deletions
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java
deleted file mode 100644
index be63f2d9fd..0000000000
--- a/src/main/java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package gtPlusPlus.core.client.renderer;
-
-import java.util.Random;
-
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.ResourceLocation;
-
-import org.lwjgl.opengl.GL11;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.random.XSTR;
-import gtPlusPlus.core.entity.EntityTeslaTowerLightning;
-
-@SideOnly(Side.CLIENT)
-public class RenderPlasmaBolt extends Render {
-
- public RenderPlasmaBolt() {
- Logger.INFO("[Render] Create custom lightning renderer.");
- }
-
- /**
- * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
- * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
- * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
- * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
- */
- public void doRender(EntityTeslaTowerLightning p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_,
- float p_76986_8_, float p_76986_9_) {
- Logger.INFO("Render Plasma. 1");
- Tessellator tessellator = Tessellator.instance;
- GL11.glDisable(GL11.GL_TEXTURE_2D);
- GL11.glDisable(GL11.GL_LIGHTING);
- GL11.glEnable(GL11.GL_BLEND);
- GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
- double[] adouble = new double[8];
- double[] adouble1 = new double[8];
- double d3 = 0.0D;
- double d4 = 0.0D;
- Random random = new XSTR(p_76986_1_.boltVertex);
-
- for (int i = 7; i >= 0; --i) {
- adouble[i] = d3;
- adouble1[i] = d4;
- d3 += (double) (random.nextInt(11) - 5);
- d4 += (double) (random.nextInt(11) - 5);
- }
-
- for (int k1 = 0; k1 < 4; ++k1) {
- Random random1 = new XSTR(p_76986_1_.boltVertex);
-
- for (int j = 0; j < 3; ++j) {
- int k = 7;
- int l = 0;
-
- if (j > 0) {
- k = 7 - j;
- }
-
- if (j > 0) {
- l = k - 2;
- }
-
- double d5 = adouble[k] - d3;
- double d6 = adouble1[k] - d4;
-
- for (int i1 = k; i1 >= l; --i1) {
- double d7 = d5;
- double d8 = d6;
-
- if (j == 0) {
- d5 += (double) (random1.nextInt(11) - 5);
- d6 += (double) (random1.nextInt(11) - 5);
- } else {
- d5 += (double) (random1.nextInt(31) - 15);
- d6 += (double) (random1.nextInt(31) - 15);
- }
-
- tessellator.startDrawing(5);
- float f2 = 0.5F;
- tessellator.setColorRGBA_F(0.9F * f2, 0.9F * f2, 1.0F * f2, 0.3F);
- double d9 = 0.1D + (double) k1 * 0.2D;
-
- if (j == 0) {
- d9 *= (double) i1 * 0.1D + 1.0D;
- }
-
- double d10 = 0.1D + (double) k1 * 0.2D;
-
- if (j == 0) {
- d10 *= (double) (i1 - 1) * 0.1D + 1.0D;
- }
-
- for (int j1 = 0; j1 < 5; ++j1) {
- double d11 = p_76986_2_ + 0.5D - d9;
- double d12 = p_76986_6_ + 0.5D - d9;
-
- if (j1 == 1 || j1 == 2) {
- d11 += d9 * 2.0D;
- }
-
- if (j1 == 2 || j1 == 3) {
- d12 += d9 * 2.0D;
- }
-
- double d13 = p_76986_2_ + 0.5D - d10;
- double d14 = p_76986_6_ + 0.5D - d10;
-
- if (j1 == 1 || j1 == 2) {
- d13 += d10 * 2.0D;
- }
-
- if (j1 == 2 || j1 == 3) {
- d14 += d10 * 2.0D;
- }
-
- tessellator.addVertex(d13 + d5, p_76986_4_ + (double) (i1 * 16), d14 + d6);
- tessellator.addVertex(d11 + d7, p_76986_4_ + (double) ((i1 + 1) * 16), d12 + d8);
- }
-
- tessellator.draw();
- }
- }
- }
- GL11.glDisable(GL11.GL_BLEND);
- GL11.glEnable(GL11.GL_LIGHTING);
- GL11.glEnable(GL11.GL_TEXTURE_2D);
- }
-
- /**
- * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
- */
- protected ResourceLocation getEntityTexture(EntityTeslaTowerLightning p_110775_1_) {
- return null;
- }
-
- /**
- * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture.
- */
- @Override
- protected ResourceLocation getEntityTexture(Entity p_110775_1_) {
- Logger.INFO("Render Plasma. 5");
- return this.getEntityTexture((EntityTeslaTowerLightning) p_110775_1_);
- }
-
- /**
- * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then
- * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic
- * (Render<T extends Entity) and this method has signature public void func_76986_a(T entity, double d, double d1,
- * double d2, float f, float f1). But JAD is pre 1.5 so doesn't do that.
- */
- @Override
- public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_,
- float p_76986_9_) {
- Logger.INFO("Render Plasma. 2");
- this.doRender(
- (EntityTeslaTowerLightning) p_76986_1_,
- p_76986_2_,
- p_76986_4_,
- p_76986_6_,
- p_76986_8_,
- p_76986_9_);
- }
-}
diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
index fd8d317fe6..5d7a39c48f 100644
--- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
@@ -51,7 +51,6 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_Industria
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill;
-import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor;
import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_MatterFabricator;
@@ -322,8 +321,6 @@ public class ConfigHandler {
GregTech.ID,
true,
"Produces fine wire and exotic cables.");
- enableMultiblock_IronBlastFurnace = config
- .getBoolean("enableMultiblockIronBlastFurnace", GregTech.ID, true, "Skip the Bronze age, very slowly.");
enableMultiblock_MatterFabricator = config
.getBoolean("enableMultiblockMatterFabricator", GregTech.ID, true, "?FAB?RIC?ATE MA?TT?ER.");
enableMultiblock_MultiTank = config.getBoolean(
diff --git a/src/main/java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java b/src/main/java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java
deleted file mode 100644
index 82615309b0..0000000000
--- a/src/main/java/gtPlusPlus/core/entity/EntityTeslaTowerLightning.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package gtPlusPlus.core.entity;
-
-import java.util.List;
-import java.util.Random;
-import java.util.UUID;
-
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.effect.EntityWeatherEffect;
-import net.minecraft.init.Blocks;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.EnumDifficulty;
-import net.minecraft.world.World;
-
-import gtPlusPlus.api.damage.DamageTeslaTower;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.api.objects.random.XSTR;
-import gtPlusPlus.core.util.minecraft.EntityUtils;
-
-public class EntityTeslaTowerLightning extends EntityWeatherEffect {
-
- /** Declares which state the lightning bolt is in. Whether it's in the air, hit the ground, etc. */
- private int lightningState;
- /** A random long that is used to change the vertex of the lightning rendered in RenderLightningBolt */
- public long boltVertex;
- /**
- * Determines the time before the EntityLightningBolt is destroyed. It is a random integer decremented over time.
- */
- private int boltLivingTime;
-
- private final UUID boltID;
- private final UUID boltOwnerID;
-
- private final Entity boltValidDamageTarget;
-
- public EntityTeslaTowerLightning(World p_i1703_1_, double p_i1703_2_, double p_i1703_4_, double p_i1703_6_,
- Entity valid, UUID owner) {
- super(p_i1703_1_);
- Logger.INFO("Plasma Bolt - Created.");
- Random rand = new XSTR(p_i1703_1_.getSeed());
- this.setLocationAndAngles(p_i1703_2_, p_i1703_4_, p_i1703_6_, 0.0F, 0.0F);
- this.lightningState = 2;
- this.boltVertex = rand.nextLong();
- this.boltLivingTime = (1) + rand.nextInt(3) + 1;
- this.boltValidDamageTarget = valid;
- this.boltID = UUID.randomUUID();
- this.boltOwnerID = owner;
-
- // Puts fires out
- if (!p_i1703_1_.isRemote && p_i1703_1_.getGameRules().getGameRuleBooleanValue("doFireTick")
- && (p_i1703_1_.difficultySetting == EnumDifficulty.NORMAL
- || p_i1703_1_.difficultySetting == EnumDifficulty.HARD)
- && p_i1703_1_.doChunksNearChunkExist(
- MathHelper.floor_double(p_i1703_2_),
- MathHelper.floor_double(p_i1703_4_),
- MathHelper.floor_double(p_i1703_6_),
- 10)) {
- Logger.INFO("Plasma Bolt - Putting out fires?.");
- int i = MathHelper.floor_double(p_i1703_2_);
- int j = MathHelper.floor_double(p_i1703_4_);
- int k = MathHelper.floor_double(p_i1703_6_);
-
- if (p_i1703_1_.getBlock(i, j, k).getMaterial() == Material.fire) {
- p_i1703_1_.setBlock(i, j, k, Blocks.air);
- }
-
- for (i = 0; i < 4; ++i) {
- j = MathHelper.floor_double(p_i1703_2_) + rand.nextInt(3) - 1;
- k = MathHelper.floor_double(p_i1703_4_) + rand.nextInt(3) - 1;
- int l = MathHelper.floor_double(p_i1703_6_) + rand.nextInt(3) - 1;
-
- if (p_i1703_1_.getBlock(j, k, l).getMaterial() == Material.fire) {
- p_i1703_1_.setBlock(j, k, l, Blocks.air);
- }
- }
- }
- }
-
- /**
- * Called to update the entity's position/logic.
- */
- @Override
- public void onUpdate() {
- // Logger.INFO("Zap");
- super.onUpdate();
- Logger.INFO("Plasma Bolt - Tick.");
- Random rand = new XSTR(this.worldObj.getSeed());
-
- if (this.lightningState == 2) {
- Logger.INFO("Plasma Bolt - Playing Sound.");
- this.worldObj.playSoundEffect(
- this.posX,
- this.posY,
- this.posZ,
- "ambient.weather.thunder",
- 10000.0F,
- 0.8F + rand.nextFloat() * 0.2F);
- }
- --this.lightningState;
-
- if (this.lightningState >= 0) {
- Logger.INFO("Plasma Bolt - state >= 0.");
- if (this.worldObj.isRemote) {
- Logger.INFO("Plasma Bolt - World is remote, resetting state to 2.");
- this.worldObj.lastLightningBolt = 2;
- } else {
- Logger.INFO("Plasma Bolt - World is server side.");
- double d0 = 3.0D;
- List<Entity> list = this.worldObj.getEntitiesWithinAABBExcludingEntity(
- this,
- AxisAlignedBB.getBoundingBox(
- this.posX - d0,
- this.posY - d0,
- this.posZ - d0,
- this.posX + d0,
- this.posY + 6.0D + d0,
- this.posZ + d0));
-
- for (int l = 0; l < list.size(); ++l) {
- Entity entity = list.get(l);
- if (this.boltValidDamageTarget.getUniqueID().equals(entity.getUniqueID())) {
- if (!entity.getUniqueID().equals(boltOwnerID)) {
- Logger.INFO("Plasma Bolt - Hurting Entity.");
- Logger.INFO("Plasma Bolt - " + entity.getCommandSenderName() + ".");
- // if (!net.minecraftforge.event.ForgeEventFactory.onEntityStruckByLightning(entity, this))
- EntityUtils.doFireDamage(entity, 5);
- EntityUtils.doDamage(entity, new DamageTeslaTower(entity), 20);
- }
- }
- }
- }
- }
-
- if (this.lightningState < 0) {
- Logger.INFO("Plasma Bolt - state < 0.");
- if (this.boltLivingTime == 0) {
- Logger.INFO("Plasma Bolt - setting dead.");
- this.setDead();
- } else if (this.lightningState < -rand.nextInt(10)) {
- Logger.INFO("Plasma Bolt - dunno.");
- --this.boltLivingTime;
- this.lightningState = 1;
- this.boltVertex = rand.nextLong();
- // Puts fires out.
- if (!this.worldObj.isRemote && this.worldObj.getGameRules().getGameRuleBooleanValue("doFireTick")
- && this.worldObj.doChunksNearChunkExist(
- MathHelper.floor_double(this.posX),
- MathHelper.floor_double(this.posY),
- MathHelper.floor_double(this.posZ),
- 10)) {
- Logger.INFO("Plasma Bolt - Putting fires out [2].");
- int i = MathHelper.floor_double(this.posX);
- int j = MathHelper.floor_double(this.posY);
- int k = MathHelper.floor_double(this.posZ);
-
- if (this.worldObj.getBlock(i, j, k).getMaterial() == Material.fire) {
- this.worldObj.setBlock(i, j, k, Blocks.air);
- }
- }
- }
- }
- }
-
- @Override
- protected void entityInit() {}
-
- /**
- * (abstract) Protected helper method to read subclass entity data from NBT.
- */
- @Override
- protected void readEntityFromNBT(NBTTagCompound p_70037_1_) {}
-
- /**
- * (abstract) Protected helper method to write subclass entity data to NBT.
- */
- @Override
- protected void writeEntityToNBT(NBTTagCompound p_70014_1_) {}
-}
diff --git a/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java b/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java
index e4f82ea80e..1254d9bdff 100644
--- a/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java
+++ b/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java
@@ -83,8 +83,6 @@ public class InternalEntityRegistry {
Utils.rgbtoHexValue(20, 200, 20),
Utils.rgbtoHexValue(20, 20, 20));
- // EntityRegistry.registerGlobalEntityID(EntitySickBlaze.class, "sickBlaze",
- // EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(0, 75, 0), Utils.rgbtoHexValue(75, 175, 75));
EntityRegistry
.registerModEntity(EntitySickBlaze.class, "sickBlaze", mEntityID++, GTplusplus.instance, 64, 20, true);
ItemCustomSpawnEgg.registerEntityForSpawnEgg(
@@ -93,18 +91,6 @@ public class InternalEntityRegistry {
Utils.rgbtoHexValue(40, 180, 40),
Utils.rgbtoHexValue(75, 75, 75));
- // EntityRegistry.registerGlobalEntityID(EntityTeslaTowerLightning.class, "plasmaBolt",
- // EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(255, 0, 0), Utils.rgbtoHexValue(125, 125,
- // 125));
- EntityRegistry.registerModEntity(
- EntityTeslaTowerLightning.class,
- "plasmaBolt",
- mEntityID++,
- GTplusplus.instance,
- 64,
- 5,
- true);
-
EntityRegistry.registerModEntity(
EntityThrowableBomb.class,
"EntityThrowableBomb",
diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
index 0d8c9fc529..8e9a1ca330 100644
--- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
+++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java
@@ -72,7 +72,6 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFishPond
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFluidHeater;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialForgeHammer;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialFuelRefinery;
-import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialGeneratorArray;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMacerator;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMassFabricator;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialMixer;
@@ -84,7 +83,6 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialThermalC
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialTreeFarm;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWashPlant;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialWiremill;
-import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIronBlastFurnace;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIsaMill;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLFTR;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechLargeTurbinesAndHeatExchanger;
@@ -103,7 +101,6 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarTower;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSteamCondenser;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSteamMultis;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSuperChests;
-import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTeslaTower;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThaumcraftDevices;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThreadedBuffers;
import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTieredChunkloaders;
@@ -152,7 +149,6 @@ public class COMPAT_HANDLER {
GregtechNuclearSaltProcessingPlant.run();
GregtechSteamCondenser.run();
GregtechSafeBlock.run();
- GregtechIronBlastFurnace.run();
GregtechIndustrialCentrifuge.run();
GregtechIndustrialCokeOven.run();
GregtechIndustrialPlatePress.run();
@@ -183,9 +179,7 @@ public class COMPAT_HANDLER {
GregtechIndustrialWashPlant.run();
GregtechSemiFluidgenerators.run();
GregtechWirelessChargers.run();
- GregtechIndustrialGeneratorArray.run();
GregtechIndustrialCuttingFactory.run();
- GregtechTeslaTower.run();
GregtechSuperChests.run();
GregtechIndustrialFishPond.run();
GregtechTieredChunkloaders.run();
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
index b846434665..bec7c04c56 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -185,7 +185,6 @@ public class CORE {
public static boolean enableMultiblock_IndustrialMacerationStack = true;
public static boolean enableMultiblock_IndustrialPlatePress = true;
public static boolean enableMultiblock_IndustrialWireMill = true;
- public static boolean enableMultiblock_IronBlastFurnace = true;
public static boolean enableMultiblock_MatterFabricator = true;
public static boolean enableMultiblock_MultiTank = true;
public static boolean enableMultiblock_PowerSubstation = true;
diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
index 65c25f9f1f..e6c441d4e8 100644
--- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -43,14 +43,12 @@ import gtPlusPlus.core.client.renderer.RenderBatKing;
import gtPlusPlus.core.client.renderer.RenderDecayChest;
import gtPlusPlus.core.client.renderer.RenderGiantChicken;
import gtPlusPlus.core.client.renderer.RenderMiningExplosivesPrimed;
-import gtPlusPlus.core.client.renderer.RenderPlasmaBolt;
import gtPlusPlus.core.client.renderer.RenderSickBlaze;
import gtPlusPlus.core.client.renderer.RenderStaballoyConstruct;
import gtPlusPlus.core.client.renderer.RenderToxinball;
import gtPlusPlus.core.common.CommonProxy;
import gtPlusPlus.core.common.compat.COMPAT_PlayerAPI;
import gtPlusPlus.core.entity.EntityPrimedMiningExplosive;
-import gtPlusPlus.core.entity.EntityTeslaTowerLightning;
import gtPlusPlus.core.entity.monster.EntityBatKing;
import gtPlusPlus.core.entity.monster.EntityGiantChickenBase;
import gtPlusPlus.core.entity.monster.EntitySickBlaze;
@@ -152,7 +150,6 @@ public class ClientProxy extends CommonProxy implements Runnable {
RenderingRegistry.registerEntityRenderingHandler(
EntityHydrofluoricAcidPotion.class,
new RenderSnowball(ModItems.itemHydrofluoricPotion));
- RenderingRegistry.registerEntityRenderingHandler(EntityTeslaTowerLightning.class, new RenderPlasmaBolt());
RenderingRegistry.registerEntityRenderingHandler(
EntityGiantChickenBase.class,
new RenderGiantChicken(new ModelGiantChicken(), 1f));
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index f8c673de6c..6a738158de 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -499,17 +499,6 @@ public class RECIPES_Machines {
}
}
- private static void multiGeneratorArray() {
-
- GT_ModHandler.addCraftingRecipe(
- GregtechItemList.Generator_Array_Controller.get(1L),
- CI.bitsd,
- new Object[] { "CTC", "FMF", "CBC", 'M', CI.getTieredGTPPMachineCasing(4, 1), 'B',
- OrePrefixes.pipeHuge.get(Materials.StainlessSteel), 'C',
- OrePrefixes.circuit.get(Materials.Data), 'F', ItemList.Electric_Pump_EV, 'T',
- CI.getSensor(4, 1) });
- }
-
private static void multiForgeHammer() {
CORE.RA.addSixSlotAssemblingRecipe(
@@ -1227,54 +1216,6 @@ public class RECIPES_Machines {
20 * 60,
120);
- if (CORE.ConfigSwitches.enableMultiblock_IronBlastFurnace) {
-
- RECIPE_IronBlastFurnace = GregtechItemList.Machine_Iron_BlastFurnace.get(1);
- RECIPE_IronPlatedBricks = GregtechItemList.Casing_IronPlatedBricks.get(1);
-
- // Iron BF
- RecipeUtils.addShapedGregtechRecipe(
- "plateDoubleAnyIron",
- "craftingFurnace",
- "plateDoubleAnyIron",
- boiler_Coal,
- CI.machineCasing_ULV,
- boiler_Coal,
- "plateDoubleAnyIron",
- "bucketLava",
- "plateDoubleAnyIron",
- RECIPE_IronBlastFurnace);
- // Iron plated Bricks
- RecipeUtils.addShapedGregtechRecipe(
- "plateAnyIron",
- RECIPES_Tools.craftingToolHardHammer,
- "plateAnyIron",
- "plateAnyIron",
- blockBricks,
- "plateAnyIron",
- "plateAnyIron",
- RECIPES_Tools.craftingToolWrench,
- "plateAnyIron",
- RECIPE_IronPlatedBricks);
-
- // Add recycle recipes for the Iron Plated Bricks
- // GT_ModHandler.addPulverisationRecipe(RECIPE_IronPlatedBricks,
- // ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6),
- // ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2), true);
- CORE.RA.addPulverisationRecipe(
- RECIPE_IronPlatedBricks,
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustIron", 6),
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustClay", 2),
- null);
- GT_Values.RA.addArcFurnaceRecipe(
- RECIPE_IronPlatedBricks,
- new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDictNoBroken("ingotWroughtIron", 6),
- ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustAsh", 2) },
- new int[] { 0 },
- 32 * 20,
- 32);
- }
-
if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) {
// Industrial Centrifuge
RECIPE_IndustrialCentrifugeController = GregtechItemList.Industrial_Centrifuge.get(1);