aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/kubatech/api/enums/ItemList.java2
-rw-r--r--src/main/java/kubatech/kubatech.java3
-rw-r--r--src/main/java/kubatech/loaders/MobHandlerLoader.java10
-rw-r--r--src/main/java/kubatech/loaders/RecipeLoader.java14
-rw-r--r--src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeEntityCrusher.java (renamed from src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java)31
-rw-r--r--src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java3
6 files changed, 30 insertions, 33 deletions
diff --git a/src/main/java/kubatech/api/enums/ItemList.java b/src/main/java/kubatech/api/enums/ItemList.java
index 2eb4a3d889..3a26974c0a 100644
--- a/src/main/java/kubatech/api/enums/ItemList.java
+++ b/src/main/java/kubatech/api/enums/ItemList.java
@@ -17,7 +17,7 @@ import gregtech.api.util.GT_Utility;
public enum ItemList implements IItemContainer {
- ExtremeExterminationChamber,
+ ExtremeEntityCrusher,
ExtremeIndustrialApiary,
ExtremeIndustrialGreenhouse,
DraconicEvolutionFusionCrafter,
diff --git a/src/main/java/kubatech/kubatech.java b/src/main/java/kubatech/kubatech.java
index 90d93b8f04..b8e44915a6 100644
--- a/src/main/java/kubatech/kubatech.java
+++ b/src/main/java/kubatech/kubatech.java
@@ -104,8 +104,7 @@ public class kubatech {
@Override
public void displayAllReleventItems(List p_78018_1_) {
super.displayAllReleventItems(p_78018_1_);
- if (ItemList.ExtremeExterminationChamber.hasBeenSet())
- p_78018_1_.add(ItemList.ExtremeExterminationChamber.get(1));
+ if (ItemList.ExtremeEntityCrusher.hasBeenSet()) p_78018_1_.add(ItemList.ExtremeEntityCrusher.get(1));
if (ItemList.ExtremeIndustrialApiary.hasBeenSet()) p_78018_1_.add(ItemList.ExtremeIndustrialApiary.get(1));
if (ItemList.ExtremeIndustrialGreenhouse.hasBeenSet())
p_78018_1_.add(ItemList.ExtremeIndustrialGreenhouse.get(1));
diff --git a/src/main/java/kubatech/loaders/MobHandlerLoader.java b/src/main/java/kubatech/loaders/MobHandlerLoader.java
index bcef5b96d9..dc8ad00ac7 100644
--- a/src/main/java/kubatech/loaders/MobHandlerLoader.java
+++ b/src/main/java/kubatech/loaders/MobHandlerLoader.java
@@ -20,8 +20,8 @@
package kubatech.loaders;
-import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber.DIAMOND_SPIKES_DAMAGE;
-import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber.MOB_SPAWN_INTERVAL;
+import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher.DIAMOND_SPIKES_DAMAGE;
+import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher.MOB_SPAWN_INTERVAL;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
@@ -62,7 +62,7 @@ import kubatech.Tags;
import kubatech.api.LoaderReference;
import kubatech.api.helpers.ReflectionHelper;
import kubatech.config.Config;
-import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber;
+import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher;
public class MobHandlerLoader {
@@ -99,8 +99,8 @@ public class MobHandlerLoader {
mDuration = Math.max(MOB_SPAWN_INTERVAL, (int) ((recipe.maxEntityHealth / DIAMOND_SPIKES_DAMAGE) * 10d));
}
- public ItemStack[] generateOutputs(Random rnd, GT_MetaTileEntity_ExtremeExterminationChamber MTE,
- double attackDamage, int lootinglevel, boolean preferInfernalDrops) {
+ public ItemStack[] generateOutputs(Random rnd, GT_MetaTileEntity_ExtremeEntityCrusher MTE, double attackDamage,
+ int lootinglevel, boolean preferInfernalDrops) {
MTE.lEUt = mEUt;
MTE.mMaxProgresstime = Math.max(MOB_SPAWN_INTERVAL, (int) ((recipe.maxEntityHealth / attackDamage) * 10d));
ArrayList<ItemStack> stacks = new ArrayList<>(this.mOutputs.size());
diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java
index c9925e1f8a..5f9d06ca8a 100644
--- a/src/main/java/kubatech/loaders/RecipeLoader.java
+++ b/src/main/java/kubatech/loaders/RecipeLoader.java
@@ -35,7 +35,7 @@ import static kubatech.api.enums.ItemList.BlackTeaLeaf;
import static kubatech.api.enums.ItemList.BruisedTeaLeaf;
import static kubatech.api.enums.ItemList.DraconicEvolutionFusionCrafter;
import static kubatech.api.enums.ItemList.EarlGrayTea;
-import static kubatech.api.enums.ItemList.ExtremeExterminationChamber;
+import static kubatech.api.enums.ItemList.ExtremeEntityCrusher;
import static kubatech.api.enums.ItemList.ExtremeIndustrialApiary;
import static kubatech.api.enums.ItemList.ExtremeIndustrialGreenhouse;
import static kubatech.api.enums.ItemList.FermentedTeaLeaf;
@@ -81,7 +81,7 @@ import gtPlusPlus.core.lib.CORE;
import kubatech.api.LoaderReference;
import kubatech.api.enums.ItemList;
import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_DEFusionCrafter;
-import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber;
+import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeEntityCrusher;
import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse;
import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_MegaIndustrialApiary;
@@ -96,13 +96,13 @@ public class RecipeLoader {
public static void addRecipes() {
if (registerMTE(
- ExtremeExterminationChamber,
- GT_MetaTileEntity_ExtremeExterminationChamber.class,
- "multimachine.exterminationchamber",
- "Extreme Extermination Chamber",
+ ExtremeEntityCrusher,
+ GT_MetaTileEntity_ExtremeEntityCrusher.class,
+ "multimachine.entitycrusher",
+ "Extreme Entity Crusher",
LoaderReference.EnderIO)) {
GT_ModHandler.addCraftingRecipe(
- ItemList.ExtremeExterminationChamber.get(1),
+ ItemList.ExtremeEntityCrusher.get(1),
bitsd,
new Object[] { "RCR", "CHC", "VVV", 'R', gregtech.api.enums.ItemList.Robot_Arm_EV, 'C',
OrePrefixes.circuit.get(Materials.Data), 'H', gregtech.api.enums.ItemList.Hull_EV, 'V',
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeEntityCrusher.java
index d17fd9abba..b7fec167cb 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeEntityCrusher.java
@@ -133,8 +133,8 @@ import kubatech.client.effect.EntityRenderer;
import kubatech.loaders.MobHandlerLoader;
import kubatech.network.CustomTileEntityPacket;
-public class GT_MetaTileEntity_ExtremeExterminationChamber
- extends KubaTechGTMultiBlockBase<GT_MetaTileEntity_ExtremeExterminationChamber>
+public class GT_MetaTileEntity_ExtremeEntityCrusher
+ extends KubaTechGTMultiBlockBase<GT_MetaTileEntity_ExtremeEntityCrusher>
implements CustomTileEntityPacketHandler, ISurvivalConstructable {
public static final double DIAMOND_SPIKES_DAMAGE = 9d;
@@ -143,11 +143,11 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber
public final Random rand = new FastRandom();
@SuppressWarnings("unused")
- public GT_MetaTileEntity_ExtremeExterminationChamber(int aID, String aName, String aNameRegional) {
+ public GT_MetaTileEntity_ExtremeEntityCrusher(int aID, String aName, String aNameRegional) {
super(aID, aName, aNameRegional);
}
- public GT_MetaTileEntity_ExtremeExterminationChamber(String aName) {
+ public GT_MetaTileEntity_ExtremeEntityCrusher(String aName) {
super(aName);
if (LoaderReference.BloodMagic) MinecraftForge.EVENT_BUS.register(this);
}
@@ -170,8 +170,8 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber
private static final Item poweredSpawnerItem = Item.getItemFromBlock(EnderIO.blockPoweredSpawner);
private static final int CASING_INDEX = 16;
private static final String STRUCTURE_PIECE_MAIN = "main";
- private static final IStructureDefinition<GT_MetaTileEntity_ExtremeExterminationChamber> STRUCTURE_DEFINITION = StructureDefinition
- .<GT_MetaTileEntity_ExtremeExterminationChamber>builder()
+ private static final IStructureDefinition<GT_MetaTileEntity_ExtremeEntityCrusher> STRUCTURE_DEFINITION = StructureDefinition
+ .<GT_MetaTileEntity_ExtremeEntityCrusher>builder()
.addShape(
STRUCTURE_PIECE_MAIN,
transpose(
@@ -187,7 +187,7 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber
.addElement('c', onElementPass(t -> t.mCasing++, ofBlock(GregTech_API.sBlockCasings2, 0)))
.addElement(
'C',
- buildHatchAdder(GT_MetaTileEntity_ExtremeExterminationChamber.class)
+ buildHatchAdder(GT_MetaTileEntity_ExtremeEntityCrusher.class)
.atLeast(InputBus, OutputBus, OutputHatch, Energy, Maintenance)
.casingIndex(CASING_INDEX)
.dot(1)
@@ -246,7 +246,7 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber
}
@Override
- public IStructureDefinition<GT_MetaTileEntity_ExtremeExterminationChamber> getStructureDefinition() {
+ public IStructureDefinition<GT_MetaTileEntity_ExtremeEntityCrusher> getStructureDefinition() {
return STRUCTURE_DEFINITION;
}
@@ -258,10 +258,10 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType("Powered Spawner")
- .addInfo("Controller block for the Extreme Extermination Chamber")
+ tt.addMachineType("Powered Spawner, EEC")
+ .addInfo("Controller block for the Extreme Entity Crusher")
.addInfo(Author)
- .addInfo("Spawns and exterminates monsters for you.")
+ .addInfo("Spawns and kills monsters for you.")
.addInfo("You have to insert the powered spawner in the controller.")
.addInfo("Base energy usage: 2,000 EU/t")
.addInfo("Supports perfect OC, minimum time: 20 ticks, after that multiplies the outputs.")
@@ -270,8 +270,7 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber
.addInfo("It will speed up the process and apply the looting level from the weapon (maximum 4 levels).")
.addInfo(EnumChatFormatting.RED + "Enchanting the spikes inside does nothing!")
.addInfo("Also produces 120 Liquid XP per operation.")
- .addInfo("If the mob spawns infernal,")
- .addInfo("it will drain 8 times more power.")
+ .addInfo("If the mob spawns infernal, it will drain 8 times more power.")
.addInfo("You can prevent infernal spawns by shift clicking with a screwdriver.")
.addInfo("Note: If the mob has forced infernal spawn, it will do it anyway.")
.addInfo("You can enable ritual mode with a screwdriver.")
@@ -311,7 +310,7 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber
@Override
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
- return new GT_MetaTileEntity_ExtremeExterminationChamber(this.mName);
+ return new GT_MetaTileEntity_ExtremeEntityCrusher(this.mName);
}
@Override
@@ -861,10 +860,10 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber
private static class EECFakePlayer extends FakePlayer {
- GT_MetaTileEntity_ExtremeExterminationChamber mte;
+ GT_MetaTileEntity_ExtremeEntityCrusher mte;
ItemStack currentWeapon;
- public EECFakePlayer(GT_MetaTileEntity_ExtremeExterminationChamber mte) {
+ public EECFakePlayer(GT_MetaTileEntity_ExtremeEntityCrusher mte) {
super(
(WorldServer) mte.getBaseMetaTileEntity()
.getWorld(),
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java
index df12c901b8..360ea1ee65 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_MegaIndustrialApiary.java
@@ -302,11 +302,10 @@ public class GT_MetaTileEntity_MegaIndustrialApiary
@Override
protected GT_Multiblock_Tooltip_Builder createTooltip() {
GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
- tt.addMachineType("Apiary")
+ tt.addMachineType("Mega Apiary")
.addInfo("Controller block for Industrial Apicultural Acclimatiser and Drone Domestication Station")
.addInfo(buildAuthorList("kuba6000", "Runakai"))
.addInfo("The ideal home for your bees")
- .addInfo("AKA. Mega Apiary")
.addInfo("Use screwdriver to change primary mode (INPUT/OUTPUT/OPERATING)")
.addInfo("Use screwdriver + shift to change operation mode (NORMAL/SWARMER)")
.addInfo("--------------------- INPUT MODE ---------------------")
generated by cgit (git 2.46.0) at 2025-03-10 09:53:48 +0000