diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/everglades')
12 files changed, 27 insertions, 102 deletions
diff --git a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java index 00c6f7deec..a378919486 100644 --- a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java @@ -16,7 +16,6 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; import gregtech.api.enums.Mods; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; @@ -32,7 +31,6 @@ import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.xmod.gregtech.HANDLER_GT; import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; -@MCVersion(value = "1.7.10") @Mod( modid = Mods.Names.G_T_PLUS_PLUS_EVERGLADES, name = Everglades.NAME, diff --git a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java b/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java index b0139b2252..e223b50645 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java +++ b/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java @@ -66,7 +66,6 @@ public class BiomeGenerator_Custom extends BiomeDecorator { this.redstoneGen = new WorldGenMinable_Custom(Blocks.redstone_ore, 10); this.diamondGen = new WorldGenMinable_Custom(Blocks.diamond_ore, 12); this.lapisGen = new WorldGenMinable_Custom(Blocks.lapis_ore, 8); - // this.fluoriteGen = new WorldGenMinable_Custom(ModBlocks.blockOreFluorite, 20); // Nature this.yellowFlowerGen = new WorldGenFlowers(Blocks.yellow_flower); diff --git a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java b/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java index 940c7b5a34..61c8ab5c26 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java @@ -1,13 +1,8 @@ package gtPlusPlus.everglades.biome; -import java.lang.reflect.Field; -import java.util.Random; - import net.minecraft.entity.monster.EntityPigZombie; import net.minecraft.entity.passive.EntityBat; import net.minecraft.entity.passive.EntitySquid; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeManager; @@ -16,11 +11,9 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.everglades.dimension.Dimension_Everglades; public class Biome_Everglades { @@ -36,16 +29,6 @@ public class Biome_Everglades { BiomeManager.addSpawnBiome(biome); } - public void generateNether(World world, Random random, int chunkX, int chunkZ) {} - - public void generateSurface(World world, Random random, int chunkX, int chunkZ) {} - - public void registerRenderers() {} - - public int addFuel(ItemStack fuel) { - return 0; - } - public void serverLoad(FMLServerStartingEvent event) {} public void preInit(FMLPreInitializationEvent event) {} @@ -85,33 +68,6 @@ public class Biome_Everglades { this.spawnableCaveCreatureList.add(new BiomeGenBase.SpawnListEntry(EntityBat.class, 10, 8, 8)); } - private synchronized boolean setBiomeID() { - try { - Field mInternalBiomeList = ReflectionUtils.getField(BiomeGenBase.class, "biomeList"); - BiomeGenBase[] mOriginalList = (BiomeGenBase[]) mInternalBiomeList.get(null); - BiomeGenBase[] mTempList = new BiomeGenBase[mOriginalList.length]; - for (int index = 0; index < mTempList.length; index++) { - mTempList[index] = mOriginalList[index]; - } - return false; - } catch (Exception e) { - Logger.REFLECTION( - "Could not access 'biomeList' field in " + BiomeGenBase.class.getCanonicalName() + "."); - e.printStackTrace(); - return false; - } - } - - @SideOnly(Side.CLIENT) - public int getBiomeGrassColor() { - return 0x111f11; - } - - @SideOnly(Side.CLIENT) - public int getBiomeFoliageColor() { - return 0x111f11; - } - @Override @SideOnly(Side.CLIENT) public int getSkyColorByTemp(float par1) { @@ -120,7 +76,6 @@ public class Biome_Everglades { @SuppressWarnings({ "unchecked", "unused" }) private boolean addToMonsterSpawnLists(Class<?> EntityClass, int a, int b, int c) { - // this.spawnableMonsterList.add(new SpawnListEntry(EntityClass, a, b, c)); this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityClass, a, b, c)); return true; } diff --git a/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java b/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java index 93c8404bb6..fe799fbe42 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java +++ b/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java @@ -12,11 +12,6 @@ public class GenLayerBiomes extends GenLayer { super(seed); } - public GenLayerBiomes(long seed, GenLayer genlayer) { - super(seed); - this.parent = genlayer; - } - @Override public int[] getInts(int x, int z, int width, int depth) { int[] dest = IntCache.getIntCache(width * depth); diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java index e3ee1b91df..b4943d1886 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java @@ -11,8 +11,6 @@ public class BlockDarkWorldSludgeFluid extends Fluid { protected static int mapColor = 0xFFFFFFFF; protected static float overlayAlpha = 0.2F; - // protected static SoundEvent emptySound = SoundEvents.ITEM_BUCKET_EMPTY; - // protected static SoundEvent fillSound = SoundEvents.ITEM_BUCKET_FILL; protected static Material material = SLUDGE; public BlockDarkWorldSludgeFluid(String fluidName, int rgbColour) { @@ -23,7 +21,7 @@ public class BlockDarkWorldSludgeFluid extends Fluid { super(fluidName); setColor(rgbColour); if (overlayAlpha != null) { - setAlpha(overlayAlpha.floatValue()); + setAlpha(overlayAlpha); } else { setAlpha(0); } diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java index 7b7dde778e..791c4321a2 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java @@ -285,8 +285,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti @Override public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { if ((par5Entity.ridingEntity == null) && (par5Entity.riddenByEntity == null) - && ((par5Entity instanceof EntityPlayerMP))) { - EntityPlayerMP thePlayer = (EntityPlayerMP) par5Entity; + && ((par5Entity instanceof EntityPlayerMP thePlayer))) { if (thePlayer.timeUntilPortal > 0) { thePlayer.timeUntilPortal = 100; } else if (thePlayer.dimension != Dimension_Everglades.DIMID) { diff --git a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java index 6567e75cfb..20748aac03 100644 --- a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java +++ b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java @@ -62,8 +62,6 @@ public class ChunkProviderModded implements IChunkProvider { /** * Holds Stronghold Generator */ - // private MapGenStronghold strongholdGenerator = new - // MapGenStronghold(); /** * Holds Village Generator */ diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java index 70dfd2b35a..efafa5cb4b 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java @@ -14,7 +14,7 @@ public abstract class WorldGen_GT { public final String mWorldGenName; public final boolean mEnabled; - private final Map<String, Boolean> mDimensionMap = new ConcurrentHashMap<String, Boolean>(); + private final Map<String, Boolean> mDimensionMap = new ConcurrentHashMap<>(); public WorldGen_GT(String aName, List aList, boolean aDefault) { this.mWorldGenName = aName; @@ -45,7 +45,7 @@ public abstract class WorldGen_GT { this.mDimensionMap.put(aDimName, Boolean.valueOf(tValue)); return tValue; } else { - return tAllowed.booleanValue(); + return tAllowed; } } } diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java index 2608b0b024..52eaaa747a 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java @@ -48,9 +48,9 @@ public class WorldGen_GT_Base implements IWorldGenerator { /** * Try re-implement Richard Hendrick's Chunk by Chunk Ore Generation from his GT5u fork. */ - public static List<Runnable> mList = new ArrayList<Runnable>(); + public static List<Runnable> mList = new ArrayList<>(); - public static HashSet<Long> ProcChunks = new HashSet<Long>(); + public static HashSet<Long> ProcChunks = new HashSet<>(); // This is probably not going to work. Trying to create a fake orevein to // put into hashtable when there will be no ores in a vein. public static WorldGen_GT_Ore_Layer noOresInVein = new WorldGen_GT_Ore_Layer( @@ -65,8 +65,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { ELEMENT.getInstance().IRON, ELEMENT.getInstance().IRON); - public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<Long, WorldGen_GT_Ore_Layer>( - 1024); + public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<>(1024); public boolean mIsGenerating = false; public static final Object listLock = new Object(); @@ -209,7 +208,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { } }; - public static ArrayList<NearbySeeds> seedList = new ArrayList<NearbySeeds>(); + public static ArrayList<NearbySeeds> seedList = new ArrayList<>(); // aX and aZ are now the by-chunk X and Z for the chunk of interest public WorldGenContainer(Random aRandom, int aX, int aZ, int aDimensionType, World aWorld, @@ -341,7 +340,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { this.mChunkGenerator, this.mChunkProvider); switch (placementResult) { - case WorldGen_GT_Ore_Layer.ORE_PLACED: + case WorldGen_GT_Ore_Layer.ORE_PLACED -> { if (debugWorldGen) GT_Log.out.println( " Added oreveinSeed=" + oreveinSeed + " tries at oremix=" @@ -353,16 +352,16 @@ public class WorldGen_GT_Base implements IWorldGenerator { validOreveins.put(oreveinSeed, tWorldGen); oreveinFound = true; Logger.INFO("[World Generation Debug] ORE_PLACED"); - break; - case WorldGen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER: + } + case WorldGen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER -> { placementAttempts++; Logger.INFO( "[World Generation Debug] NO_ORE_IN_BOTTOM_LAYER | Attempts: " + placementAttempts); - // SHould do retry in this case - // until out of chances - break; - case WorldGen_GT_Ore_Layer.NO_OVERLAP: + } + // SHould do retry in this case + // until out of chances + case WorldGen_GT_Ore_Layer.NO_OVERLAP -> { // Orevein didn't reach this chunk, // can't add it yet to the hash Logger.INFO("[World Generation Debug] NO_OVERLAP"); @@ -378,8 +377,8 @@ public class WorldGen_GT_Base implements IWorldGenerator { + tDimensionName); validOreveins.put(oreveinSeed, tWorldGen); oreveinFound = true; - break; - case WorldGen_GT_Ore_Layer.NO_OVERLAP_AIR_BLOCK: + } + case WorldGen_GT_Ore_Layer.NO_OVERLAP_AIR_BLOCK -> { if (debugWorldGen) GT_Log.out.println( " No overlap and air block in test spot=" + oreveinSeed + " " @@ -393,7 +392,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { // SHould do retry in this case until out of chances Logger.INFO("[World Generation Debug] NO_OVERLAP_AIR_BLOCK"); placementAttempts++; - break; + } } break; // Try the next orevein } catch (Throwable e) { @@ -484,12 +483,12 @@ public class WorldGen_GT_Base implements IWorldGenerator { this.mChunkGenerator, this.mChunkProvider); switch (placementResult) { - case WorldGen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER: + case WorldGen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER -> { if (debugWorldGen) GT_Log.out.println(" No ore in bottom layer"); - break; - case WorldGen_GT_Ore_Layer.NO_OVERLAP: + } + case WorldGen_GT_Ore_Layer.NO_OVERLAP -> { if (debugWorldGen) GT_Log.out.println(" No overlap"); - break; + } } } } diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java index b8e53047af..19bec827c0 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java @@ -28,7 +28,7 @@ import gtPlusPlus.xmod.gregtech.HANDLER_GT; public class WorldGen_GT_Ore_Layer extends WorldGen_GT { - public static ArrayList<WorldGen_GT_Ore_Layer> sList = new ArrayList<WorldGen_GT_Ore_Layer>(); + public static ArrayList<WorldGen_GT_Ore_Layer> sList = new ArrayList<>(); public static int sWeight = 0; public final short mMinY; public final short mMaxY; @@ -56,9 +56,6 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { public static final int ORE_PLACED = 4; public static final int NO_OVERLAP_AIR_BLOCK = 5; - // public final boolean mMoon; - // public final boolean mMars; - // public final boolean mAsteroid; public final String aTextWorldgen = "worldgen."; public WorldGen_GT_Ore_Layer(String aName, int aMinY, int aMaxY, int aWeight, int aDensity, int aSize, @@ -92,10 +89,6 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { .get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld); this.mNether = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Nether", aNether); this.mEnd = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "TheEnd", aEnd); - // this.mMoon = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Moon", aMoon); - // this.mMars = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Mars", aMars); - // this.mAsteroid = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Asteroid", - // aAsteroid); this.mMinY = 5; short mMaxY = 14; if (mMaxY < (this.mMinY + 7)) { @@ -134,14 +127,6 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { // not exist"); if (this.mEnabled) { - // GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mPrimaryMeta % 1000)], aMinY, aMaxY, - // aWeight, aOverworld, aNether, aEnd); - // GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSecondaryMeta % 1000)], aMinY, aMaxY, - // aWeight, aOverworld, aNether, aEnd); - // GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mBetweenMeta % 1000)], aMinY, aMaxY, - // aWeight, aOverworld, aNether, aEnd); - // GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSporadicMeta % 1000)], aMinY, aMaxY, - // aWeight, aOverworld, aNether, aEnd); sWeight += this.mWeight; } } @@ -442,7 +427,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { private String fString = "unset", ore1String = "unset", ore2String = "unset", ore3String = "unset", ore4String = "unset"; - Map<Materials, String> gtOreMap = new HashMap<Materials, String>(); + Map<Materials, String> gtOreMap = new HashMap<>(); public boolean setOreBlock(World aWorld, int aX, int aY, int aZ, Block aMetaData, boolean isSmallOre, boolean air) { if (!air) { diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java index 5c734f5a5e..bdc9de19db 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java @@ -235,8 +235,7 @@ public class WorldGen_Ores { ORES.AGARDITE_LA, ORES.AGARDITE_CD); - public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<Long, WorldGen_GT_Ore_Layer>( - 1024); + public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<>(1024); static long ID = 0; diff --git a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java index 2951ed3a57..15fcd1fde4 100644 --- a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java +++ b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java @@ -449,11 +449,11 @@ public class TeleporterDimensionMod extends Teleporter { while (iterator.hasNext()) { Long olong = (Long) iterator.next(); Teleporter.PortalPosition portalposition = (Teleporter.PortalPosition) this.destinationCoordinateCache - .getValueByKey(olong.longValue()); + .getValueByKey(olong); if (portalposition == null || portalposition.lastUpdateTime < j) { iterator.remove(); - this.destinationCoordinateCache.remove(olong.longValue()); + this.destinationCoordinateCache.remove(olong); } } } |