upstream/ThaumicHorizons
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ThaumicHorizons.git synced 2026-10-25 20:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44 from chill-was-taken/remove-commented-code

Browse Source 
Remove commented-out code and obscure comments
This commit is contained in:
Martin Robertz authored and GitHub committed 2023-06-18 14:36:29 +02:00
2 parents b4b80bd72c 6517272910
commit 8a482aeaff
7 files changed
+4 -47
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/kentington/thaumichorizons/common/ThaumicHorizons.java
-12
View File
@@ -657,12 +657,6 @@ public class ThaumicHorizons {
GameRegistry.registerItem(itemGolemBellTH, "Golemancy Bell TH");
ConfigItems.itemGolemBell = itemGolemBellTH;
/*
* try { GameRegistry.addSubstitutionAlias("Thaumcraft:GolemBell", Type.ITEM, itemGolemBellTH);
* ConfigItems.itemGolemBell = itemGolemBellTH; } catch (ExistingSubstitutionException var7) {
* var7.printStackTrace(); //System.out.
* println("WARNING: Unable to override golemancer\'s bell! Animated golems will behave unpredictably!"); }
*/
GameRegistry.registerItem(itemBoatGreatwood, "boatGreatwood");
GameRegistry.registerItem(itemBoatThaumium, "boatThaumium");
@@ -758,14 +752,8 @@ public class ThaumicHorizons {
FMLCommonHandler.instance().bus().register(instance);
}
// public static Boolean OBFUSCATED = false;
@EventHandler
public void init(FMLInitializationEvent event) {
/*
* boolean obf = true; try { obf = ((LaunchClassLoader)
* Transformer.class.getClassLoader()).getClassBytes("net.minecraft.world.World") == null; } catch (IOException
* iox) { } OBFUSCATED = obf;
*/
proxy.registerKeyBindings();
proxy.registerDisplayInformation();
NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy);
src/main/java/com/kentington/thaumichorizons/common/blocks/BlockGatewayPortal.java
-4
View File
@@ -189,7 +189,6 @@ public class BlockGatewayPortal extends Block {
return this.leftSide(isXAligned, side);
}
}
// break;
}
case 1, 2, 3 -> {
return this.leftSide(isXAligned, side);
@@ -230,7 +229,6 @@ public class BlockGatewayPortal extends Block {
break Label_0410;
}
}
// break;
}
case 5 -> {
switch (side) {
@@ -335,7 +333,6 @@ public class BlockGatewayPortal extends Block {
return this.rightSide(isXAligned, side);
}
}
// break;
}
case 11, 12, 13 -> {
return this.rightSide(isXAligned, side);
@@ -376,7 +373,6 @@ public class BlockGatewayPortal extends Block {
break Label_0410;
}
}
// break;
}
}
}
src/main/java/com/kentington/thaumichorizons/common/lib/PocketPlaneData.java
-5
View File
@@ -66,7 +66,6 @@ public class PocketPlaneData {
public static void generatePocketPlane(final AspectList aspects, final PocketPlaneData data, final World world,
final int vortexX, final int vortexY, final int vortexZ, final int returnID) {
if (!world.isRemote) {
// System.out.println("Starting pocket plane generation");
final int xCenter = 0;
final int yCenter = 128;
final int zCenter = 256 * PocketPlaneData.planes.size();
@@ -110,7 +109,6 @@ public class PocketPlaneData {
data.portalD = new int[4];
PocketPlaneData.planes.add(data);
PocketPlaneData.positions.put(pocketPlaneMAXID, Vec3.createVectorHelper(vortexX, vortexY, vortexZ));
// System.out.println("Finished with pocket plane generation!");
world.getChunkFromBlockCoords(vortexX, vortexZ).isModified = true;
creatures = 0;
++pocketPlaneMAXID;
@@ -1340,7 +1338,6 @@ public class PocketPlaneData {
public static void drawAPocket(final int xCenter, final int yCenter, final int zCenter, final PocketPlaneData data,
final World world, final AspectList aspects, final int noise, final Block block, final int md,
final int xSize, final int zSize, final int xOffset, final int yOffset, final int zOffset) {
// System.out.println("Drawing a pocket of " + block + " with width " + xSize + " and length " + zSize);
final NoiseGeneratorOctaves noiseGen = new NoiseGeneratorOctaves(world.rand, 10);
double[] noiseDataTop = null;
noiseDataTop = noiseGen.generateNoiseOctaves(
@@ -1615,7 +1612,6 @@ public class PocketPlaneData {
}
public static void destroyPortal(final int id, final int which) {
// System.out.println("Destroying portal " + which + " in plane " + id);
final PocketPlaneData data = PocketPlaneData.planes.get(id);
final World world = MinecraftServer.getServer().worldServerForDimension(ThaumicHorizons.dimensionPocketId);
if (which == 1) {
@@ -1658,7 +1654,6 @@ public class PocketPlaneData {
}
public static void makePortal(final int id, final int which, final int xCoord, final int yCoord, final int zCoord) {
// System.out.println("Creating portal " + which + " in plane " + id);
final PocketPlaneData data = PocketPlaneData.planes.get(id);
final World world = MinecraftServer.getServer().worldServerForDimension(ThaumicHorizons.dimensionPocketId);
if (which == 1) {
src/main/java/com/kentington/thaumichorizons/common/lib/PocketPlaneThread.java
-1
View File
@@ -31,7 +31,6 @@ public class PocketPlaneThread implements Runnable {
@Override
public void run() {
// System.out.println("Starting pocket plane generation thread...");
PocketPlaneData.generatePocketPlane(this.aspects, this.data, this.world, this.x, this.y, this.z, this.returnID);
}
}
src/main/java/com/kentington/thaumichorizons/common/tiles/TileCloud.java
-4
View File
@@ -243,7 +243,6 @@ public class TileCloud extends TileThaumcraft {
break;
}
}
// break;
}
}
}
@@ -353,7 +352,6 @@ public class TileCloud extends TileThaumcraft {
}
this.entityDropItem(new ItemStack(ConfigItems.itemNugget, 1, 0), 0.3f);
}
// break;
}
case 5 -> {
switch (this.worldObj.rand.nextInt(10)) {
@@ -388,7 +386,6 @@ public class TileCloud extends TileThaumcraft {
break Label_4978;
}
}
// break;
}
case 6 -> {
Aspect asp = null;
@@ -805,7 +802,6 @@ public class TileCloud extends TileThaumcraft {
}
}
}
// break;
}
case 9 -> {
this.worldObj.spawnEntityInWorld(
src/main/java/com/kentington/thaumichorizons/common/tiles/TilePortalTH.java
+1 -17
View File
@@ -85,23 +85,7 @@ public class TilePortalTH extends TileThaumcraft {
}
player.timeUntilPortal = 50;
final int oldDim = player.dimension;
/*
* player.mcServer.getConfigurationManager().transferPlayerToDimension(player, this.dimension,
* (Teleporter)new NightmareTeleporter(mServer.worldServerForDimension(this.dimension))); if
* (oldDim == ThaumicHorizons.dimensionPocketId &&
* PocketPlaneData.positions.containsKey(player.getCommandSenderName())) {
* //System.out.println("Loading position " +
* PocketPlaneData.positions.get(player.getCommandSenderName()));
* player.setPositionAndUpdate(PocketPlaneData.positions.get(player.getCommandSenderName()).
* xCoord, PocketPlaneData.positions.get(player.getCommandSenderName()).yCoord,
* PocketPlaneData.positions.get(player.getCommandSenderName()).zCoord); } else { if
* (this.pocket < 0) { continue; } PocketPlaneData.positions.put(player.getCommandSenderName(),
* Vec3.createVectorHelper(this.xCoord + 0.5, this.yCoord + 0.5, this.zCoord + 0.5));
* //System.out.println("Saving position " +
* PocketPlaneData.positions.get(player.getCommandSenderName()));
* player.setPositionAndUpdate(0.5, 129.0, (double)(128 * (this.pocket - 3) + 0.5f));
* this.worldObj.setBlockToAir(this.xCoord, this.yCoord, this.zCoord);
*/ }
}
}
}
}
src/main/java/com/kentington/thaumichorizons/common/tiles/TileVat.java
+3 -4
View File
@@ -241,7 +241,6 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
public void updateEntity() {
super.updateEntity();
if (this.firstTick && this.entityNBTObj != null) {
//// System.out.println("Initialized vat");
loadContainedEntity(entityNBTObj);
this.firstTick = false;
}
@@ -599,7 +598,7 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
for (final ChunkCoordinates cc : this.pedestals) {
final TileEntity te = this.worldObj.getTileEntity(cc.posX, cc.posY, cc.posZ);
if (te instanceof final TilePedestal ped) {
if (ped.getStackInSlot(0) == null) { // func_70301_a
if (ped.getStackInSlot(0) == null) {
continue;
}
components.add(ped.getStackInSlot(0).copy());
@@ -1341,7 +1340,7 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
this.setEntityContained(
this.worldObj.getPlayerEntityByName(
nbttagcompound.getCompoundTag("entity").getString("playerName")));
} else if (nbttagcompound.getCompoundTag("entity").hasKey("id")) { // && !worldObj.isRemote){
} else if (nbttagcompound.getCompoundTag("entity").hasKey("id")) {
this.setEntityContained(
(EntityLivingBase) EntityList
@@ -1575,7 +1574,7 @@ public class TileVat extends TileThaumcraft implements IAspectContainer, IEssent
return null;
}
public void setInventorySlotContents(final int slot, final ItemStack stack) { // func_70299_a
public void setInventorySlotContents(final int slot, final ItemStack stack) {
if (slot == 0) {
this.sample = stack;
} else {