keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Don't use import static with net.minecraft classes. Using the latest MCP snapshots this causes an import conflict. (#2742)

Browse source
This commit is contained in:
Matthew Prenger 2016-04-09 18:03:46 -05:00 committed by LexManos
parent a018e14939
commit 2a3774def3
2 changed files with 47 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
src/main/java/net/minecraftforge/common/BiomeDictionary.java
View file

@ -3,12 +3,13 @@ package net.minecraftforge.common;
import java.util.*; import java.util.*;
import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.FMLLog;
import net.minecraft.init.Biomes;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.world.biome.*; import net.minecraft.world.biome.*;
import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.common.util.EnumHelper;
import net.minecraftforge.event.terraingen.DeferredBiomeDecorator; import net.minecraftforge.event.terraingen.DeferredBiomeDecorator;
import static net.minecraft.init.Biomes.*;
import static net.minecraftforge.common.BiomeDictionary.Type.*; import static net.minecraftforge.common.BiomeDictionary.Type.*;
public class BiomeDictionary public class BiomeDictionary
@ -435,45 +436,45 @@ public class BiomeDictionary
private static void registerVanillaBiomes() private static void registerVanillaBiomes()
{ {
registerBiomeType(ocean, OCEAN ); registerBiomeType(Biomes.ocean, OCEAN );
registerBiomeType(plains, PLAINS ); registerBiomeType(Biomes.plains, PLAINS );
registerBiomeType(desert, HOT, DRY, SANDY ); registerBiomeType(Biomes.desert, HOT, DRY, SANDY );
registerBiomeType(extremeHills, MOUNTAIN, HILLS ); registerBiomeType(Biomes.extremeHills, MOUNTAIN, HILLS );
registerBiomeType(forest, FOREST ); registerBiomeType(Biomes.forest, FOREST );
registerBiomeType(taiga, COLD, CONIFEROUS, FOREST ); registerBiomeType(Biomes.taiga, COLD, CONIFEROUS, FOREST );
registerBiomeType(taigaHills, COLD, CONIFEROUS, FOREST, HILLS ); registerBiomeType(Biomes.taigaHills, COLD, CONIFEROUS, FOREST, HILLS );
registerBiomeType(swampland, WET, SWAMP ); registerBiomeType(Biomes.swampland, WET, SWAMP );
registerBiomeType(river, RIVER ); registerBiomeType(Biomes.river, RIVER );
registerBiomeType(frozenOcean, COLD, OCEAN, SNOWY ); registerBiomeType(Biomes.frozenOcean, COLD, OCEAN, SNOWY );
registerBiomeType(frozenRiver, COLD, RIVER, SNOWY ); registerBiomeType(Biomes.frozenRiver, COLD, RIVER, SNOWY );
registerBiomeType(icePlains, COLD, SNOWY, WASTELAND ); registerBiomeType(Biomes.icePlains, COLD, SNOWY, WASTELAND );
registerBiomeType(iceMountains, COLD, SNOWY, MOUNTAIN ); registerBiomeType(Biomes.iceMountains, COLD, SNOWY, MOUNTAIN );
registerBiomeType(beach, BEACH ); registerBiomeType(Biomes.beach, BEACH );
registerBiomeType(desertHills, HOT, DRY, SANDY, HILLS ); registerBiomeType(Biomes.desertHills, HOT, DRY, SANDY, HILLS );
registerBiomeType(jungle, HOT, WET, DENSE, JUNGLE ); registerBiomeType(Biomes.jungle, HOT, WET, DENSE, JUNGLE );
registerBiomeType(jungleHills, HOT, WET, DENSE, JUNGLE, HILLS); registerBiomeType(Biomes.jungleHills, HOT, WET, DENSE, JUNGLE, HILLS);
registerBiomeType(forestHills, FOREST, HILLS ); registerBiomeType(Biomes.forestHills, FOREST, HILLS );
registerBiomeType(sky, COLD, DRY, END ); registerBiomeType(Biomes.sky, COLD, DRY, END );
registerBiomeType(hell, HOT, DRY, NETHER ); registerBiomeType(Biomes.hell, HOT, DRY, NETHER );
registerBiomeType(mushroomIsland, MUSHROOM ); registerBiomeType(Biomes.mushroomIsland, MUSHROOM );
registerBiomeType(extremeHillsEdge, MOUNTAIN ); registerBiomeType(Biomes.extremeHillsEdge, MOUNTAIN );
registerBiomeType(mushroomIslandShore, MUSHROOM, BEACH ); registerBiomeType(Biomes.mushroomIslandShore, MUSHROOM, BEACH );
registerBiomeType(jungleEdge, HOT, WET, JUNGLE, FOREST ); registerBiomeType(Biomes.jungleEdge, HOT, WET, JUNGLE, FOREST );
registerBiomeType(deepOcean, OCEAN ); registerBiomeType(Biomes.deepOcean, OCEAN );
registerBiomeType(stoneBeach, BEACH ); registerBiomeType(Biomes.stoneBeach, BEACH );
registerBiomeType(coldBeach, COLD, BEACH, SNOWY ); registerBiomeType(Biomes.coldBeach, COLD, BEACH, SNOWY );
registerBiomeType(birchForest, FOREST ); registerBiomeType(Biomes.birchForest, FOREST );
registerBiomeType(birchForestHills, FOREST, HILLS ); registerBiomeType(Biomes.birchForestHills, FOREST, HILLS );
registerBiomeType(roofedForest, SPOOKY, DENSE, FOREST ); registerBiomeType(Biomes.roofedForest, SPOOKY, DENSE, FOREST );
registerBiomeType(coldTaiga, COLD, CONIFEROUS, FOREST, SNOWY ); registerBiomeType(Biomes.coldTaiga, COLD, CONIFEROUS, FOREST, SNOWY );
registerBiomeType(coldTaigaHills, COLD, CONIFEROUS, FOREST, SNOWY, HILLS); registerBiomeType(Biomes.coldTaigaHills, COLD, CONIFEROUS, FOREST, SNOWY, HILLS);
registerBiomeType(megaTaiga, COLD, CONIFEROUS, FOREST ); registerBiomeType(Biomes.megaTaiga, COLD, CONIFEROUS, FOREST );
registerBiomeType(megaTaigaHills, COLD, CONIFEROUS, FOREST, HILLS ); registerBiomeType(Biomes.megaTaigaHills, COLD, CONIFEROUS, FOREST, HILLS );
registerBiomeType(extremeHillsPlus, MOUNTAIN, FOREST, SPARSE ); registerBiomeType(Biomes.extremeHillsPlus, MOUNTAIN, FOREST, SPARSE );
registerBiomeType(savanna, HOT, SAVANNA, PLAINS, SPARSE ); registerBiomeType(Biomes.savanna, HOT, SAVANNA, PLAINS, SPARSE );
registerBiomeType(savannaPlateau, HOT, SAVANNA, PLAINS, SPARSE ); registerBiomeType(Biomes.savannaPlateau, HOT, SAVANNA, PLAINS, SPARSE );
registerBiomeType(mesa, MESA, SANDY ); registerBiomeType(Biomes.mesa, MESA, SANDY );
registerBiomeType(mesaPlateau_F, MESA, SPARSE, SANDY ); registerBiomeType(Biomes.mesaPlateau_F, MESA, SPARSE, SANDY );
registerBiomeType(mesaPlateau, MESA, SANDY ); registerBiomeType(Biomes.mesaPlateau, MESA, SANDY );
} }
} }

15
src/main/java/net/minecraftforge/common/ForgeHooks.java
View file

@ -1,14 +1,5 @@
package net.minecraftforge.common; package net.minecraftforge.common;
import static net.minecraft.init.Blocks.diamond_block;
import static net.minecraft.init.Blocks.diamond_ore;
import static net.minecraft.init.Blocks.emerald_block;
import static net.minecraft.init.Blocks.emerald_ore;
import static net.minecraft.init.Blocks.gold_block;
import static net.minecraft.init.Blocks.gold_ore;
import static net.minecraft.init.Blocks.lit_redstone_ore;
import static net.minecraft.init.Blocks.redstone_ore;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.util.ArrayList; import java.util.ArrayList;
@ -217,7 +208,11 @@ public class ForgeHooks
} }
Blocks.obsidian.setHarvestLevel("pickaxe", 3); Blocks.obsidian.setHarvestLevel("pickaxe", 3);
for (Block block : new Block[]{emerald_ore, emerald_block, diamond_ore, diamond_block, gold_ore, gold_block, redstone_ore, lit_redstone_ore}) Block[] oreBlocks = new Block[] {
Blocks.emerald_ore, Blocks.emerald_block, Blocks.diamond_ore, Blocks.diamond_block,
Blocks.gold_ore, Blocks.gold_block, Blocks.redstone_ore, Blocks.lit_redstone_ore
};
for (Block block : oreBlocks)
{ {
block.setHarvestLevel("pickaxe", 2); block.setHarvestLevel("pickaxe", 2);
} }