From 25209a4bcb9b79647a77bc0c63515f1192154098 Mon Sep 17 00:00:00 2001 From: Muramasa Date: Fri, 29 Jul 2016 18:54:45 +0100 Subject: Merge GG into GT --- .../galacticgreg/GT_TileEntity_Ores_Space.java | 79 ++++++++++++++++++++++ .../galacticgreg/GT_Worldgenerator_Space.java | 9 +++ 2 files changed, 88 insertions(+) create mode 100644 src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java create mode 100644 src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java (limited to 'src/main/java/bloodasp/galacticgreg') diff --git a/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java b/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java new file mode 100644 index 0000000000..7b88384287 --- /dev/null +++ b/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java @@ -0,0 +1,79 @@ +package bloodasp.galacticgreg; + +import gregtech.api.GregTech_API; +import gregtech.common.blocks.GT_TileEntity_Ores; +import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; +import micdoodle8.mods.galacticraft.planets.mars.blocks.MarsBlocks; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class GT_TileEntity_Ores_Space extends GT_TileEntity_Ores { + + public static boolean setOreBlock(World aWorld, int aX, int aY, int aZ, int aMetaData) { + return setOreBlock(aWorld, aX, aY, aZ, aMetaData, false); + } + + public static boolean setOreBlock(World aWorld, int aX, int aY, int aZ, int aMetaData, boolean air) { + // GalacticGreg.tmp1++; + // System.out.println("start gen ore"+aMetaData); + if (!air) { + aY = Math.min(aWorld.getActualHeight(), Math.max(aY, 1)); + } + Block tBlock = aWorld.getBlock(aX, aY, aZ); + int tMeta=0; + tMeta = aWorld.getBlockMetadata(aX, aY, aZ); + if ((aMetaData > 0) && ((tBlock != Blocks.air) || air)) { + if (aMetaData < 1000) { + if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.netherrack)) { + aMetaData += 1000; + } else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.end_stone)) { + aMetaData += 2000; + } else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites)) { + if (tBlock == GregTech_API.sBlockGranites) { + if (tMeta < 8) { + aMetaData += 3000; + } else { + aMetaData += 4000; + } + } else { + aMetaData += 3000; + } + } + else + if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GCBlocks.blockMoon)) { + if (tMeta != 4) { + return false; + } + } else if (tBlock == MarsBlocks.marsBlock) { + aMetaData += 4000; + if (tMeta != 9) { + // GalacticGreg.tmp3++; + return false; + } else { + } + } else if (!tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone)) { + if (!air) { + return false; + } + } + } +// System.out.println("test "+aMetaData); +// System.out.println("block: "+tBlock.getUnlocalizedName()+" meta: "+aWorld.getBlockMetadata(aX, aY, aZ)); + // GalacticGreg.tmp2++; + // System.out.println("set ore block"); + if(tMeta==4||tMeta==9||tBlock==Blocks.end_stone||tBlock== GregTech_API.sBlockGranites){ + //if(aMetaData>1000&&aMetaData<5000){System.out.println("aMeta: "+aMetaData);} + aWorld.setBlock(aX, aY, aZ, GregTech_API.sBlockOres1, getHarvestData((short) aMetaData), 0); + TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); + if ((tTileEntity instanceof GT_TileEntity_Ores)) { + // GalacticGreg.tmp4++; + ((GT_TileEntity_Ores) tTileEntity).mMetaData = ((short) aMetaData); + ((GT_TileEntity_Ores) tTileEntity).mNatural = true; + } + return true;} + } + return false; + } +} diff --git a/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java b/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java new file mode 100644 index 0000000000..309f75c888 --- /dev/null +++ b/src/main/java/bloodasp/galacticgreg/GT_Worldgenerator_Space.java @@ -0,0 +1,9 @@ +package bloodasp.galacticgreg; + +import gregtech.common.GT_Worldgenerator; + +public class GT_Worldgenerator_Space extends GT_Worldgenerator { + public GT_Worldgenerator_Space() { + super(); + } +} -- cgit From b5b8ea974ff79201a9dd12d77917d3b28d07579c Mon Sep 17 00:00:00 2001 From: Muramasa Date: Fri, 29 Jul 2016 20:13:02 +0100 Subject: Bugs & Removal of GG's TileEntityOres --- .../galacticgreg/GT_TileEntity_Ores_Space.java | 79 ---------------------- 1 file changed, 79 deletions(-) delete mode 100644 src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java (limited to 'src/main/java/bloodasp/galacticgreg') diff --git a/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java b/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java deleted file mode 100644 index 7b88384287..0000000000 --- a/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java +++ /dev/null @@ -1,79 +0,0 @@ -package bloodasp.galacticgreg; - -import gregtech.api.GregTech_API; -import gregtech.common.blocks.GT_TileEntity_Ores; -import micdoodle8.mods.galacticraft.core.blocks.GCBlocks; -import micdoodle8.mods.galacticraft.planets.mars.blocks.MarsBlocks; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -public class GT_TileEntity_Ores_Space extends GT_TileEntity_Ores { - - public static boolean setOreBlock(World aWorld, int aX, int aY, int aZ, int aMetaData) { - return setOreBlock(aWorld, aX, aY, aZ, aMetaData, false); - } - - public static boolean setOreBlock(World aWorld, int aX, int aY, int aZ, int aMetaData, boolean air) { - // GalacticGreg.tmp1++; - // System.out.println("start gen ore"+aMetaData); - if (!air) { - aY = Math.min(aWorld.getActualHeight(), Math.max(aY, 1)); - } - Block tBlock = aWorld.getBlock(aX, aY, aZ); - int tMeta=0; - tMeta = aWorld.getBlockMetadata(aX, aY, aZ); - if ((aMetaData > 0) && ((tBlock != Blocks.air) || air)) { - if (aMetaData < 1000) { - if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.netherrack)) { - aMetaData += 1000; - } else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.end_stone)) { - aMetaData += 2000; - } else if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites)) { - if (tBlock == GregTech_API.sBlockGranites) { - if (tMeta < 8) { - aMetaData += 3000; - } else { - aMetaData += 4000; - } - } else { - aMetaData += 3000; - } - } - else - if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GCBlocks.blockMoon)) { - if (tMeta != 4) { - return false; - } - } else if (tBlock == MarsBlocks.marsBlock) { - aMetaData += 4000; - if (tMeta != 9) { - // GalacticGreg.tmp3++; - return false; - } else { - } - } else if (!tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone)) { - if (!air) { - return false; - } - } - } -// System.out.println("test "+aMetaData); -// System.out.println("block: "+tBlock.getUnlocalizedName()+" meta: "+aWorld.getBlockMetadata(aX, aY, aZ)); - // GalacticGreg.tmp2++; - // System.out.println("set ore block"); - if(tMeta==4||tMeta==9||tBlock==Blocks.end_stone||tBlock== GregTech_API.sBlockGranites){ - //if(aMetaData>1000&&aMetaData<5000){System.out.println("aMeta: "+aMetaData);} - aWorld.setBlock(aX, aY, aZ, GregTech_API.sBlockOres1, getHarvestData((short) aMetaData), 0); - TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if ((tTileEntity instanceof GT_TileEntity_Ores)) { - // GalacticGreg.tmp4++; - ((GT_TileEntity_Ores) tTileEntity).mMetaData = ((short) aMetaData); - ((GT_TileEntity_Ores) tTileEntity).mNatural = true; - } - return true;} - } - return false; - } -} -- cgit