aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/goodgenerator/blocks/regularBlock
diff options
context:
space:
mode:
authorNotAPenguin <michiel.vandeginste@gmail.com>2024-09-02 23:17:17 +0200
committerGitHub <noreply@github.com>2024-09-02 23:17:17 +0200
commit1b820de08a05070909a267e17f033fcf58ac8710 (patch)
tree02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/goodgenerator/blocks/regularBlock
parentafd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff)
downloadGT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip
The Great Renaming (#3014)
* move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names
Diffstat (limited to 'src/main/java/goodgenerator/blocks/regularBlock')
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/BlockCasing.java (renamed from src/main/java/goodgenerator/blocks/regularBlock/Casing.java)24
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/BlockComplexTextureCasing.java (renamed from src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java)4
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/BlockFrame.java (renamed from src/main/java/goodgenerator/blocks/regularBlock/Frame.java)6
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/BlockTEContainer.java (renamed from src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java)54
-rw-r--r--src/main/java/goodgenerator/blocks/regularBlock/BlockTurbineCasing.java (renamed from src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java)10
5 files changed, 49 insertions, 49 deletions
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockCasing.java
index c10b0f7184..4f784b5501 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/Casing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockCasing.java
@@ -17,9 +17,9 @@ import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import goodgenerator.main.GoodGenerator;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
-public class Casing extends Block {
+public class BlockCasing extends Block {
@SideOnly(Side.CLIENT)
protected IIcon[] texture;
@@ -27,17 +27,17 @@ public class Casing extends Block {
String[] textureNames;
protected String name;
- public Casing(String name) {
+ public BlockCasing(String name) {
super(Material.iron);
this.setHardness(9.0F);
this.setResistance(5.0F);
this.name = name;
this.setHarvestLevel("wrench", 2);
this.setCreativeTab(GoodGenerator.GG);
- GregTech_API.registerMachineBlock(this, -1);
+ GregTechAPI.registerMachineBlock(this, -1);
}
- public Casing(String name, String[] texture) {
+ public BlockCasing(String name, String[] texture) {
super(Material.iron);
this.setHardness(9.0F);
this.setResistance(5.0F);
@@ -45,10 +45,10 @@ public class Casing extends Block {
this.textureNames = texture;
this.setHarvestLevel("wrench", 2);
this.setCreativeTab(GoodGenerator.GG);
- GregTech_API.registerMachineBlock(this, -1);
+ GregTechAPI.registerMachineBlock(this, -1);
}
- public Casing(String name, String[] texture, Material material) {
+ public BlockCasing(String name, String[] texture, Material material) {
super(material);
this.setHardness(9.0F);
this.setResistance(5.0F);
@@ -56,7 +56,7 @@ public class Casing extends Block {
this.textureNames = texture;
this.setHarvestLevel("wrench", 2);
this.setCreativeTab(GoodGenerator.GG);
- GregTech_API.registerMachineBlock(this, -1);
+ GregTechAPI.registerMachineBlock(this, -1);
}
@Override
@@ -90,15 +90,15 @@ public class Casing extends Block {
@Override
public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
- if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
- GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+ if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
+ GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
}
}
@Override
public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) {
- if (GregTech_API.isMachineBlock(this, aMetaData)) {
- GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+ if (GregTechAPI.isMachineBlock(this, aMetaData)) {
+ GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
}
}
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockComplexTextureCasing.java
index 0a0169d0b4..03b7f61557 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/ComplexTextureCasing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockComplexTextureCasing.java
@@ -11,14 +11,14 @@ import net.minecraft.util.IIcon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-public class ComplexTextureCasing extends Casing {
+public class BlockComplexTextureCasing extends BlockCasing {
@SideOnly(Side.CLIENT)
protected IIcon[] texture1, texture2;
String[] textureSide;
String[] textureTopAndDown;
- public ComplexTextureCasing(String name, String[] textureSide, String[] textureTopAndDown) {
+ public BlockComplexTextureCasing(String name, String[] textureSide, String[] textureTopAndDown) {
super(name);
this.textureSide = textureSide;
this.textureTopAndDown = textureTopAndDown;
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockFrame.java
index b4acb03518..b29ef7f2f2 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/Frame.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockFrame.java
@@ -6,9 +6,9 @@ import net.minecraft.world.IBlockAccess;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-public class Frame extends Casing {
+public class BlockFrame extends BlockCasing {
- public Frame(String name, String[] texture) {
+ public BlockFrame(String name, String[] texture) {
super(name, texture, Material.iron);
}
@@ -20,7 +20,7 @@ public class Frame extends Casing {
@Override
@SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered(IBlockAccess worldClient, int xCoord, int yCoord, int zCoord, int aSide) {
- if (worldClient.getBlock(xCoord, yCoord, zCoord) instanceof Frame) return false;
+ if (worldClient.getBlock(xCoord, yCoord, zCoord) instanceof BlockFrame) return false;
return super.shouldSideBeRendered(worldClient, xCoord, yCoord, zCoord, aSide);
}
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockTEContainer.java
index dcd2bdd801..9bf51b7377 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/TEBlock.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockTEContainer.java
@@ -20,16 +20,16 @@ import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-import goodgenerator.blocks.tileEntity.EssentiaHatch;
-import goodgenerator.blocks.tileEntity.EssentiaOutputHatch;
-import goodgenerator.blocks.tileEntity.EssentiaOutputHatch_ME;
+import goodgenerator.blocks.tileEntity.MTEEssentiaHatch;
+import goodgenerator.blocks.tileEntity.MTEEssentiaOutputHatch;
+import goodgenerator.blocks.tileEntity.MTEEssentiaOutputHatchME;
import goodgenerator.main.GoodGenerator;
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTUtility;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.IEssentiaContainerItem;
-public class TEBlock extends BlockContainer {
+public class BlockTEContainer extends BlockContainer {
@SideOnly(Side.CLIENT)
protected IIcon[] texture;
@@ -38,7 +38,7 @@ public class TEBlock extends BlockContainer {
protected String name;
protected int index;
- public TEBlock(String name, String[] texture, CreativeTabs Tab) {
+ public BlockTEContainer(String name, String[] texture, CreativeTabs Tab) {
super(Material.iron);
this.setHardness(9.0F);
this.setResistance(5.0F);
@@ -46,10 +46,10 @@ public class TEBlock extends BlockContainer {
this.textureNames = texture;
this.setHarvestLevel("wrench", 2);
this.setCreativeTab(GoodGenerator.GG);
- GregTech_API.registerMachineBlock(this, -1);
+ GregTechAPI.registerMachineBlock(this, -1);
}
- public TEBlock(String name, String[] texture, int index) {
+ public BlockTEContainer(String name, String[] texture, int index) {
super(Material.iron);
this.setHardness(9.0F);
this.setResistance(5.0F);
@@ -58,10 +58,10 @@ public class TEBlock extends BlockContainer {
this.setHarvestLevel("wrench", 2);
this.index = index;
this.setCreativeTab(GoodGenerator.GG);
- GregTech_API.registerMachineBlock(this, -1);
+ GregTechAPI.registerMachineBlock(this, -1);
}
- public TEBlock(String name, String[] texture, Material material) {
+ public BlockTEContainer(String name, String[] texture, Material material) {
super(material);
this.setHardness(9.0F);
this.setResistance(5.0F);
@@ -69,7 +69,7 @@ public class TEBlock extends BlockContainer {
this.textureNames = texture;
this.setHarvestLevel("wrench", 2);
this.setCreativeTab(GoodGenerator.GG);
- GregTech_API.registerMachineBlock(this, -1);
+ GregTechAPI.registerMachineBlock(this, -1);
}
public int getIndex() {
@@ -107,15 +107,15 @@ public class TEBlock extends BlockContainer {
@Override
public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
- if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
- GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+ if (GregTechAPI.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
+ GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
}
}
@Override
public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) {
- if (GregTech_API.isMachineBlock(this, aMetaData)) {
- GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
+ if (GregTechAPI.isMachineBlock(this, aMetaData)) {
+ GregTechAPI.causeMachineUpdate(aWorld, aX, aY, aZ);
}
aWorld.removeTileEntity(aX, aY, aZ);
}
@@ -144,11 +144,11 @@ public class TEBlock extends BlockContainer {
public TileEntity createTileEntity(World world, int meta) {
switch (index) {
case 1:
- return new EssentiaHatch();
+ return new MTEEssentiaHatch();
case 2:
- return new EssentiaOutputHatch();
+ return new MTEEssentiaOutputHatch();
case 3:
- return new EssentiaOutputHatch_ME();
+ return new MTEEssentiaOutputHatchME();
default:
return null;
}
@@ -162,7 +162,7 @@ public class TEBlock extends BlockContainer {
} else {
TileEntity tile = world.getTileEntity(x, y, z);
if (index == 1) {
- if (tile instanceof EssentiaHatch) {
+ if (tile instanceof MTEEssentiaHatch) {
ItemStack tItemStack = player.getHeldItem();
if (tItemStack != null) {
Item tItem = tItemStack.getItem();
@@ -172,26 +172,26 @@ public class TEBlock extends BlockContainer {
.size() > 0) {
Aspect tLocked = ((IEssentiaContainerItem) tItem).getAspects(player.getHeldItem())
.getAspects()[0];
- ((EssentiaHatch) tile).setLockedAspect(tLocked);
- GT_Utility.sendChatToPlayer(
+ ((MTEEssentiaHatch) tile).setLockedAspect(tLocked);
+ GTUtility.sendChatToPlayer(
player,
String.format(
StatCollector.translateToLocal("essentiahatch.chat.0"),
tLocked.getLocalizedDescription()));
}
} else {
- ((EssentiaHatch) tile).setLockedAspect(null);
- GT_Utility.sendChatToPlayer(player, StatCollector.translateToLocal("essentiahatch.chat.1"));
+ ((MTEEssentiaHatch) tile).setLockedAspect(null);
+ GTUtility.sendChatToPlayer(player, StatCollector.translateToLocal("essentiahatch.chat.1"));
}
world.markBlockForUpdate(x, y, z);
return true;
} else return false;
} else if (index == 2) {
- if (tile instanceof EssentiaOutputHatch && player.isSneaking()) {
+ if (tile instanceof MTEEssentiaOutputHatch && player.isSneaking()) {
ItemStack tItemStack = player.getHeldItem();
if (tItemStack == null) {
- ((EssentiaOutputHatch) tile).clear();
- GT_Utility
+ ((MTEEssentiaOutputHatch) tile).clear();
+ GTUtility
.sendChatToPlayer(player, StatCollector.translateToLocal("essentiaoutputhatch.chat.0"));
}
return true;
diff --git a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java b/src/main/java/goodgenerator/blocks/regularBlock/BlockTurbineCasing.java
index 986ab4e0c8..6b6de38161 100644
--- a/src/main/java/goodgenerator/blocks/regularBlock/TurbineCasing.java
+++ b/src/main/java/goodgenerator/blocks/regularBlock/BlockTurbineCasing.java
@@ -5,7 +5,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraftforge.common.util.ForgeDirection;
-import goodgenerator.blocks.tileEntity.base.GT_MetaTileEntity_LargeTurbineBase;
+import goodgenerator.blocks.tileEntity.base.MTELargeTurbineBase;
import goodgenerator.client.render.BlockRenderHandler;
import goodgenerator.main.GoodGenerator;
import gregtech.api.enums.Textures;
@@ -14,7 +14,7 @@ import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.render.TextureFactory;
-public class TurbineCasing extends Casing implements ITextureBlock {
+public class BlockTurbineCasing extends BlockCasing implements ITextureBlock {
public static IIconContainer[][] turbineShape = new IIconContainer[3][9];
public IIconContainer base;
@@ -24,7 +24,7 @@ public class TurbineCasing extends Casing implements ITextureBlock {
turbineShape[i][j - 1] = new Textures.BlockIcons.CustomIcon("icons/turbines/TURBINE_" + i + "" + j);
}
- public TurbineCasing(String name, String texture) {
+ public BlockTurbineCasing(String name, String texture) {
super(name, new String[] { GoodGenerator.MOD_ID + ":" + texture });
base = new Textures.BlockIcons.CustomIcon("icons/" + texture);
}
@@ -33,9 +33,9 @@ public class TurbineCasing extends Casing implements ITextureBlock {
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
if (!(tTileEntity instanceof IGregTechTileEntity)) return 0;
IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity;
- if (tTile.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbineBase && tTile.getFrontFacing() == side) {
+ if (tTile.getMetaTileEntity() instanceof MTELargeTurbineBase && tTile.getFrontFacing() == side) {
if (tTile.isActive()) return 1;
- return ((GT_MetaTileEntity_LargeTurbineBase) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3;
+ return ((MTELargeTurbineBase) tTile.getMetaTileEntity()).hasTurbine() ? 2 : 3;
}
return 0;
}