diff --git a/build.gradle b/build.gradle index af88eb9..95c47ea 100644 --- a/build.gradle +++ b/build.gradle @@ -35,12 +35,12 @@ compileJava { targetCompatibility = 1.8 } -version = "1.9.4-0.3.5" +version = "1.9.4-0.3.6" group = "gtlp.prettyniceores" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "prettyniceores" minecraft { - version = "1.9.4-12.17.0.1954" + version = "1.9.4-12.17.0.1962" runDir = "run" // the mappings can be changed at any time, and must be in the following format. diff --git a/src/main/java/gtlp/prettyniceores/Constants.java b/src/main/java/gtlp/prettyniceores/Constants.java new file mode 100644 index 0000000..d820899 --- /dev/null +++ b/src/main/java/gtlp/prettyniceores/Constants.java @@ -0,0 +1,17 @@ +package gtlp.prettyniceores; + +/** + * Created by Marv1 on 09.06.2016. + */ +public final class Constants { + + public static final String MOD_ID = "prettyniceores"; + public static final String VERSION = "1.9.4-0.3.6"; + public static final String UPDATE_URL = "https://raw.githubusercontent.com/GiantTreeLP/PrettyNiceOres/1.9.4/versions.json"; + public static final String NAME = "PrettyNiceOres"; + public static final String DEPENDENCIES = "after:neotech;after:tconstruct"; + protected static final String MC_VERSION = "[1.9.4,)"; + + private Constants() { + } +} diff --git a/src/main/java/gtlp/prettyniceores/PrettyNiceOres.java b/src/main/java/gtlp/prettyniceores/PrettyNiceOres.java index 32eb462..27058cf 100644 --- a/src/main/java/gtlp/prettyniceores/PrettyNiceOres.java +++ b/src/main/java/gtlp/prettyniceores/PrettyNiceOres.java @@ -1,6 +1,10 @@ package gtlp.prettyniceores; -import gtlp.prettyniceores.blocks.*; +import gtlp.prettyniceores.blocks.modded.NiceCopperOre; +import gtlp.prettyniceores.blocks.modded.NiceLeadOre; +import gtlp.prettyniceores.blocks.modded.NiceSilverOre; +import gtlp.prettyniceores.blocks.modded.NiceTinOre; +import gtlp.prettyniceores.blocks.vanilla.*; import gtlp.prettyniceores.common.CommonProxy; import gtlp.prettyniceores.events.OnPlayerLoginEvent; import gtlp.prettyniceores.generators.NiceOresGenerator; @@ -33,30 +37,30 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Stream; import static net.minecraftforge.oredict.RecipeSorter.Category.SHAPELESS; /** * Created by Marv1 on 22.05.2016 as part of forge-modding-1.9. */ -@Mod(modid = PrettyNiceOres.MOD_ID, - version = PrettyNiceOres.VERSION, +@Mod(modid = Constants.MOD_ID, + version = Constants.VERSION, canBeDeactivated = true, - name = "PrettyNiceOres", - updateJSON = PrettyNiceOres.UPDATE_URL, - dependencies = "after:neotech;after:tconstruct", - acceptedMinecraftVersions = "[1.9.4,)") + name = Constants.NAME, + updateJSON = Constants.UPDATE_URL, + dependencies = Constants.DEPENDENCIES, + acceptedMinecraftVersions = Constants.MC_VERSION) + public class PrettyNiceOres { - public static final String MOD_ID = "prettyniceores"; - public static final String VERSION = "1.9.4-0.3.5"; public static final Map blockList = new HashMap<>(); public static final Map itemList = new HashMap<>(); public static final Map itemBlockList = new HashMap<>(); - public static final Logger LOGGER = LogManager.getLogger(MOD_ID); - public static final String UPDATE_URL = "https://raw.githubusercontent.com/GiantTreeLP/PrettyNiceOres/1.9.4/versions.json"; - final static Block[] modBlocks = {new NiceCopperOre()}; + public static final Logger LOGGER = LogManager.getLogger(Constants.MOD_ID); + @SidedProxy(clientSide = "gtlp.prettyniceores.client.ClientProxy", serverSide = "gtlp.prettyniceores.common.CommonProxy") public static CommonProxy proxy; + public List recipeList = new ArrayList<>(); /** @@ -66,7 +70,7 @@ public class PrettyNiceOres { */ @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { - RecipeSorter.register(MOD_ID + ":shapelessoredict", ShapelessOreDictRecipe.class, SHAPELESS, "after:minecraft:shapeless"); + RecipeSorter.register(Constants.MOD_ID + ":shapelessoredict", ShapelessOreDictRecipe.class, SHAPELESS, "after:minecraft:shapeless"); addVanillaOres(); addModOres(); @@ -121,13 +125,13 @@ private void addVanillaOres() { * Adds all replacements for mod ores, if they have been created by any other mod. */ private void addModOres() { - for (Block block : modBlocks) { - if (block instanceof IOreDictCompatible && block instanceof INamedBlock) { - if (OreDictionary.doesOreNameExist(((IOreDictCompatible) block).getOreDictType())) { + Block[] blockArray = {new NiceCopperOre(), new NiceTinOre(), new NiceSilverOre(), new NiceLeadOre()}; + + Stream.of(blockArray).filter(block -> block instanceof IOreDictCompatible && block instanceof INamedBlock) + .filter(block -> OreDictionary.doesOreNameExist(((IOreDictCompatible) block).getOreDictType())) + .forEach(block -> { blockList.put(((INamedBlock) block).getName(), block); - } - } - } + }); } private void addModItems() { diff --git a/src/main/java/gtlp/prettyniceores/blocks/NiceOreBase.java b/src/main/java/gtlp/prettyniceores/blocks/NiceOreBase.java index 2d9b20f..1a1bbf2 100644 --- a/src/main/java/gtlp/prettyniceores/blocks/NiceOreBase.java +++ b/src/main/java/gtlp/prettyniceores/blocks/NiceOreBase.java @@ -1,5 +1,6 @@ package gtlp.prettyniceores.blocks; +import gtlp.prettyniceores.Constants; import gtlp.prettyniceores.PrettyNiceOres; import net.minecraft.block.Block; import net.minecraft.block.BlockOre; @@ -40,7 +41,7 @@ public abstract class NiceOreBase extends BlockOre { */ protected NiceOreBase(String name) { super(); - setRegistryName(PrettyNiceOres.MOD_ID, name); + setRegistryName(Constants.MOD_ID, name); setUnlocalizedName(name); setDefaultState(blockState.getBaseState()); setHardness(10f); @@ -79,7 +80,7 @@ public final boolean removedByPlayer(@Nonnull IBlockState state, World world, @N stopWatch.start(); getAdjacentBlocks(world, pos, world.getBlockState(pos).getBlock(), player, itemMainhand, blocks); stopWatch.stop(); - PrettyNiceOres.LOGGER.printf(Level.INFO, "Removed %d blocks in %d ns", blocks.get(), stopWatch.getNanoTime()); + PrettyNiceOres.LOGGER.printf(Level.INFO, "Removed %d blocks in %d ms", blocks.get(), stopWatch.getSplitTime()); itemMainhand.attemptDamageItem(itemMainhand.getItemDamage() % 2 == 0 ? 1 : 2, world.rand); } } diff --git a/src/main/java/gtlp/prettyniceores/blocks/NiceCopperOre.java b/src/main/java/gtlp/prettyniceores/blocks/modded/NiceCopperOre.java similarity index 82% rename from src/main/java/gtlp/prettyniceores/blocks/NiceCopperOre.java rename to src/main/java/gtlp/prettyniceores/blocks/modded/NiceCopperOre.java index 2542f53..e295701 100644 --- a/src/main/java/gtlp/prettyniceores/blocks/NiceCopperOre.java +++ b/src/main/java/gtlp/prettyniceores/blocks/modded/NiceCopperOre.java @@ -1,8 +1,10 @@ -package gtlp.prettyniceores.blocks; +package gtlp.prettyniceores.blocks.modded; +import gtlp.prettyniceores.blocks.NiceOreBase; import gtlp.prettyniceores.interfaces.INamedBlock; import gtlp.prettyniceores.interfaces.IOreDictCompatible; import gtlp.prettyniceores.interfaces.ISmeltable; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -16,7 +18,7 @@ public class NiceCopperOre extends NiceOreBase implements ISmeltable, IOreDictCo public NiceCopperOre() { super(NAME); - setHarvestLevel("pickaxe", 1); + setHarvestLevel("pickaxe", Item.ToolMaterial.STONE.getHarvestLevel()); } @Override diff --git a/src/main/java/gtlp/prettyniceores/blocks/modded/NiceLeadOre.java b/src/main/java/gtlp/prettyniceores/blocks/modded/NiceLeadOre.java new file mode 100644 index 0000000..5a5032a --- /dev/null +++ b/src/main/java/gtlp/prettyniceores/blocks/modded/NiceLeadOre.java @@ -0,0 +1,42 @@ +package gtlp.prettyniceores.blocks.modded; + +import gtlp.prettyniceores.blocks.NiceOreBase; +import gtlp.prettyniceores.interfaces.INamedBlock; +import gtlp.prettyniceores.interfaces.IOreDictCompatible; +import gtlp.prettyniceores.interfaces.ISmeltable; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +/** + * Created by Marv1 on 23.05.2016 as part of forge-modding-1.9. + */ +public class NiceLeadOre extends NiceOreBase implements ISmeltable, IOreDictCompatible, INamedBlock { + + public static final String NAME = "nice_lead_ore"; + public static final String OREDICTTYPE = "oreLead"; + + public NiceLeadOre() { + super(NAME); + setHarvestLevel("pickaxe", Item.ToolMaterial.STONE.getHarvestLevel()); + } + + @Override + public final ItemStack getSmeltingResult() { + return OreDictionary.getOres("ingotLead").get(0); + } + + @Override + public final float getSmeltingExp() { + return 2f; + } + + @Override + public final String getOreDictType() { + return OREDICTTYPE; + } + + public final String getName() { + return NAME; + } +} diff --git a/src/main/java/gtlp/prettyniceores/blocks/modded/NiceSilverOre.java b/src/main/java/gtlp/prettyniceores/blocks/modded/NiceSilverOre.java new file mode 100644 index 0000000..c0a5819 --- /dev/null +++ b/src/main/java/gtlp/prettyniceores/blocks/modded/NiceSilverOre.java @@ -0,0 +1,42 @@ +package gtlp.prettyniceores.blocks.modded; + +import gtlp.prettyniceores.blocks.NiceOreBase; +import gtlp.prettyniceores.interfaces.INamedBlock; +import gtlp.prettyniceores.interfaces.IOreDictCompatible; +import gtlp.prettyniceores.interfaces.ISmeltable; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +/** + * Created by Marv1 on 09.06.2016. + */ +public class NiceSilverOre extends NiceOreBase implements ISmeltable, IOreDictCompatible, INamedBlock { + + public static final String NAME = "nice_silver_ore"; + public static final String OREDICTTYPE = "oreSilver"; + + public NiceSilverOre() { + super(NAME); + setHarvestLevel("pickaxe", Item.ToolMaterial.IRON.getHarvestLevel()); + } + + @Override + public final ItemStack getSmeltingResult() { + return OreDictionary.getOres("ingotSilver").get(0); + } + + @Override + public final float getSmeltingExp() { + return 2f; + } + + @Override + public final String getOreDictType() { + return OREDICTTYPE; + } + + public final String getName() { + return NAME; + } +} diff --git a/src/main/java/gtlp/prettyniceores/blocks/modded/NiceTinOre.java b/src/main/java/gtlp/prettyniceores/blocks/modded/NiceTinOre.java new file mode 100644 index 0000000..4bf880e --- /dev/null +++ b/src/main/java/gtlp/prettyniceores/blocks/modded/NiceTinOre.java @@ -0,0 +1,42 @@ +package gtlp.prettyniceores.blocks.modded; + +import gtlp.prettyniceores.blocks.NiceOreBase; +import gtlp.prettyniceores.interfaces.INamedBlock; +import gtlp.prettyniceores.interfaces.IOreDictCompatible; +import gtlp.prettyniceores.interfaces.ISmeltable; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +/** + * Created by Marv1 on 09.06.2016. + */ +public class NiceTinOre extends NiceOreBase implements ISmeltable, IOreDictCompatible, INamedBlock { + + public static final String NAME = "nice_tin_ore"; + public static final String OREDICTTYPE = "oreTin"; + + public NiceTinOre() { + super(NAME); + setHarvestLevel("pickaxe", Item.ToolMaterial.IRON.getHarvestLevel()); + } + + @Override + public final ItemStack getSmeltingResult() { + return OreDictionary.getOres("ingotTin").get(0); + } + + @Override + public final float getSmeltingExp() { + return 2f; + } + + @Override + public final String getOreDictType() { + return OREDICTTYPE; + } + + public final String getName() { + return NAME; + } +} diff --git a/src/main/java/gtlp/prettyniceores/blocks/NiceCoalOre.java b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceCoalOre.java similarity index 90% rename from src/main/java/gtlp/prettyniceores/blocks/NiceCoalOre.java rename to src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceCoalOre.java index aa46325..538e41d 100644 --- a/src/main/java/gtlp/prettyniceores/blocks/NiceCoalOre.java +++ b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceCoalOre.java @@ -1,5 +1,6 @@ -package gtlp.prettyniceores.blocks; +package gtlp.prettyniceores.blocks.vanilla; +import gtlp.prettyniceores.blocks.NiceOreBase; import gtlp.prettyniceores.interfaces.INamedBlock; import gtlp.prettyniceores.interfaces.IOreDictCompatible; import gtlp.prettyniceores.interfaces.ISmeltable; @@ -26,7 +27,7 @@ public class NiceCoalOre extends NiceOreBase implements ISmeltable, IOreDictComp public NiceCoalOre() { super(NAME); - setHarvestLevel("pickaxe", 0); + setHarvestLevel("pickaxe", Item.ToolMaterial.WOOD.getHarvestLevel()); } @Override diff --git a/src/main/java/gtlp/prettyniceores/blocks/NiceDiamondOre.java b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceDiamondOre.java similarity index 91% rename from src/main/java/gtlp/prettyniceores/blocks/NiceDiamondOre.java rename to src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceDiamondOre.java index ad05681..eb4db81 100644 --- a/src/main/java/gtlp/prettyniceores/blocks/NiceDiamondOre.java +++ b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceDiamondOre.java @@ -1,5 +1,6 @@ -package gtlp.prettyniceores.blocks; +package gtlp.prettyniceores.blocks.vanilla; +import gtlp.prettyniceores.blocks.NiceOreBase; import gtlp.prettyniceores.interfaces.INamedBlock; import gtlp.prettyniceores.interfaces.IOreDictCompatible; import gtlp.prettyniceores.interfaces.ISmeltable; @@ -27,7 +28,7 @@ public class NiceDiamondOre extends NiceOreBase implements ISmeltable, IOreDictC public NiceDiamondOre() { super(NAME); setLightLevel(2 / 15f); - setHarvestLevel("pickaxe", 2); + setHarvestLevel("pickaxe", Item.ToolMaterial.IRON.getHarvestLevel()); } @Override diff --git a/src/main/java/gtlp/prettyniceores/blocks/NiceEmeraldOre.java b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceEmeraldOre.java similarity index 91% rename from src/main/java/gtlp/prettyniceores/blocks/NiceEmeraldOre.java rename to src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceEmeraldOre.java index 1cb20fa..1856599 100644 --- a/src/main/java/gtlp/prettyniceores/blocks/NiceEmeraldOre.java +++ b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceEmeraldOre.java @@ -1,5 +1,6 @@ -package gtlp.prettyniceores.blocks; +package gtlp.prettyniceores.blocks.vanilla; +import gtlp.prettyniceores.blocks.NiceOreBase; import gtlp.prettyniceores.interfaces.INamedBlock; import gtlp.prettyniceores.interfaces.IOreDictCompatible; import gtlp.prettyniceores.interfaces.ISmeltable; @@ -27,7 +28,7 @@ public class NiceEmeraldOre extends NiceOreBase implements ISmeltable, IOreDictC public NiceEmeraldOre() { super(NAME); setLightLevel(2 / 15f); - setHarvestLevel("pickaxe", 2); + setHarvestLevel("pickaxe", Item.ToolMaterial.IRON.getHarvestLevel()); } @Override diff --git a/src/main/java/gtlp/prettyniceores/blocks/NiceGoldOre.java b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceGoldOre.java similarity index 82% rename from src/main/java/gtlp/prettyniceores/blocks/NiceGoldOre.java rename to src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceGoldOre.java index d39d083..fe2922a 100644 --- a/src/main/java/gtlp/prettyniceores/blocks/NiceGoldOre.java +++ b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceGoldOre.java @@ -1,9 +1,11 @@ -package gtlp.prettyniceores.blocks; +package gtlp.prettyniceores.blocks.vanilla; +import gtlp.prettyniceores.blocks.NiceOreBase; import gtlp.prettyniceores.interfaces.INamedBlock; import gtlp.prettyniceores.interfaces.IOreDictCompatible; import gtlp.prettyniceores.interfaces.ISmeltable; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; /** @@ -16,7 +18,7 @@ public class NiceGoldOre extends NiceOreBase implements ISmeltable, IOreDictComp public NiceGoldOre() { super(NAME); - setHarvestLevel("pickaxe", 2); + setHarvestLevel("pickaxe", Item.ToolMaterial.IRON.getHarvestLevel()); } @Override diff --git a/src/main/java/gtlp/prettyniceores/blocks/NiceIronOre.java b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceIronOre.java similarity index 82% rename from src/main/java/gtlp/prettyniceores/blocks/NiceIronOre.java rename to src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceIronOre.java index c4137ef..d456f61 100644 --- a/src/main/java/gtlp/prettyniceores/blocks/NiceIronOre.java +++ b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceIronOre.java @@ -1,9 +1,11 @@ -package gtlp.prettyniceores.blocks; +package gtlp.prettyniceores.blocks.vanilla; +import gtlp.prettyniceores.blocks.NiceOreBase; import gtlp.prettyniceores.interfaces.INamedBlock; import gtlp.prettyniceores.interfaces.IOreDictCompatible; import gtlp.prettyniceores.interfaces.ISmeltable; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; /** @@ -16,7 +18,7 @@ public class NiceIronOre extends NiceOreBase implements ISmeltable, IOreDictComp public NiceIronOre() { super(NAME); - setHarvestLevel("pickaxe", 1); + setHarvestLevel("pickaxe", Item.ToolMaterial.STONE.getHarvestLevel()); } @Override diff --git a/src/main/java/gtlp/prettyniceores/blocks/NiceLapisOre.java b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceLapisOre.java similarity index 91% rename from src/main/java/gtlp/prettyniceores/blocks/NiceLapisOre.java rename to src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceLapisOre.java index 25e9b52..23800b3 100644 --- a/src/main/java/gtlp/prettyniceores/blocks/NiceLapisOre.java +++ b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceLapisOre.java @@ -1,5 +1,6 @@ -package gtlp.prettyniceores.blocks; +package gtlp.prettyniceores.blocks.vanilla; +import gtlp.prettyniceores.blocks.NiceOreBase; import gtlp.prettyniceores.interfaces.INamedBlock; import gtlp.prettyniceores.interfaces.IOreDictCompatible; import gtlp.prettyniceores.interfaces.ISmeltable; @@ -27,7 +28,7 @@ public class NiceLapisOre extends NiceOreBase implements ISmeltable, IOreDictCom public NiceLapisOre() { super(NAME); - setHarvestLevel("pickaxe", 2); + setHarvestLevel("pickaxe", Item.ToolMaterial.IRON.getHarvestLevel()); } @Override diff --git a/src/main/java/gtlp/prettyniceores/blocks/NiceNetherQuartzOre.java b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceNetherQuartzOre.java similarity index 87% rename from src/main/java/gtlp/prettyniceores/blocks/NiceNetherQuartzOre.java rename to src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceNetherQuartzOre.java index 0910e76..8bce58d 100644 --- a/src/main/java/gtlp/prettyniceores/blocks/NiceNetherQuartzOre.java +++ b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceNetherQuartzOre.java @@ -1,5 +1,6 @@ -package gtlp.prettyniceores.blocks; +package gtlp.prettyniceores.blocks.vanilla; +import gtlp.prettyniceores.blocks.NiceOreBase; import gtlp.prettyniceores.interfaces.INamedBlock; import gtlp.prettyniceores.interfaces.IOreDictCompatible; import gtlp.prettyniceores.interfaces.ISmeltable; @@ -27,7 +28,7 @@ public class NiceNetherQuartzOre extends NiceOreBase implements ISmeltable, IOre public NiceNetherQuartzOre() { super(NAME); - setHarvestLevel("pickaxe", 2); + setHarvestLevel("pickaxe", Item.ToolMaterial.IRON.getHarvestLevel()); } @Override @@ -42,7 +43,7 @@ public final int getExpDrop(@Nullable IBlockState state, IBlockAccess world, Blo } @Override - public int quantityDropped(IBlockState state, int fortune, @Nonnull Random random) { + public final int quantityDropped(IBlockState state, int fortune, @Nonnull Random random) { return super.quantityDropped(state, fortune, random); } diff --git a/src/main/java/gtlp/prettyniceores/blocks/NiceRedstoneOre.java b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceRedstoneOre.java similarity index 80% rename from src/main/java/gtlp/prettyniceores/blocks/NiceRedstoneOre.java rename to src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceRedstoneOre.java index 4943264..313577c 100644 --- a/src/main/java/gtlp/prettyniceores/blocks/NiceRedstoneOre.java +++ b/src/main/java/gtlp/prettyniceores/blocks/vanilla/NiceRedstoneOre.java @@ -1,5 +1,6 @@ -package gtlp.prettyniceores.blocks; +package gtlp.prettyniceores.blocks.vanilla; +import gtlp.prettyniceores.blocks.NiceOreBase; import gtlp.prettyniceores.interfaces.INamedBlock; import gtlp.prettyniceores.interfaces.IOreDictCompatible; import gtlp.prettyniceores.interfaces.ISmeltable; @@ -30,7 +31,7 @@ public class NiceRedstoneOre extends NiceOreBase implements ISmeltable, IOreDict public NiceRedstoneOre() { super(NAME); - setHarvestLevel("pickaxe", 2); + setHarvestLevel("pickaxe", Item.ToolMaterial.IRON.getHarvestLevel()); } public final Item getItemDropped(IBlockState state, Random rand, int fortune) { @@ -60,38 +61,38 @@ public final boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState s private void spawnParticles(World worldIn, BlockPos pos) { Random random = worldIn.rand; - double d0 = 0.0625D; + float d0 = 0.0625F; for (int i = 0; i < 6; ++i) { - double d1 = (double) ((float) pos.getX() + random.nextFloat()); - double d2 = (double) ((float) pos.getY() + random.nextFloat()); - double d3 = (double) ((float) pos.getZ() + random.nextFloat()); + float d1 = ((float) pos.getX() + random.nextFloat()); + float d2 = ((float) pos.getY() + random.nextFloat()); + float d3 = ((float) pos.getZ() + random.nextFloat()); if (i == 0 && !worldIn.getBlockState(pos.up()).isOpaqueCube()) { - d2 = (double) pos.getY() + d0 + 1.0D; + d2 = pos.getY() + d0 + 1.0F; } if (i == 1 && !worldIn.getBlockState(pos.down()).isOpaqueCube()) { - d2 = (double) pos.getY() - d0; + d2 = pos.getY() - d0; } if (i == 2 && !worldIn.getBlockState(pos.south()).isOpaqueCube()) { - d3 = (double) pos.getZ() + d0 + 1.0D; + d3 = pos.getZ() + d0 + 1.0F; } if (i == 3 && !worldIn.getBlockState(pos.north()).isOpaqueCube()) { - d3 = (double) pos.getZ() - d0; + d3 = pos.getZ() - d0; } if (i == 4 && !worldIn.getBlockState(pos.east()).isOpaqueCube()) { - d1 = (double) pos.getX() + d0 + 1.0D; + d1 = pos.getX() + d0 + 1.0F; } if (i == 5 && !worldIn.getBlockState(pos.west()).isOpaqueCube()) { - d1 = (double) pos.getX() - d0; + d1 = pos.getX() - d0; } - if (d1 < (double) pos.getX() || d1 > (double) (pos.getX() + 1) || d2 < 0.0D || d2 > (double) (pos.getY() + 1) || d3 < (double) pos.getZ() || d3 > (double) (pos.getZ() + 1)) { + if (d1 < pos.getX() || d1 > (pos.getX() + 1) || d2 < 0.0F || d2 > (pos.getY() + 1) || d3 < pos.getZ() || d3 > (pos.getZ() + 1)) { worldIn.spawnParticle(EnumParticleTypes.REDSTONE, d1, d2, d3, 0.0D, 0.0D, 0.0D); } } diff --git a/src/main/java/gtlp/prettyniceores/events/OnPlayerLoginEvent.java b/src/main/java/gtlp/prettyniceores/events/OnPlayerLoginEvent.java index 4272675..ec6c008 100644 --- a/src/main/java/gtlp/prettyniceores/events/OnPlayerLoginEvent.java +++ b/src/main/java/gtlp/prettyniceores/events/OnPlayerLoginEvent.java @@ -1,6 +1,6 @@ package gtlp.prettyniceores.events; -import gtlp.prettyniceores.PrettyNiceOres; +import gtlp.prettyniceores.Constants; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; @@ -25,7 +25,7 @@ public class OnPlayerLoginEvent { public void versionCheck(EntityJoinWorldEvent event) { if (!notified && event.getEntity() instanceof EntityPlayer && event.getWorld().isRemote) { EntityPlayer player = (EntityPlayer) event.getEntity(); - Optional modContainer = Loader.instance().getModList().stream().filter(container -> container.getModId().equals(PrettyNiceOres.MOD_ID)).findFirst(); + Optional modContainer = Loader.instance().getModList().stream().filter(container -> container.getModId().equals(Constants.MOD_ID)).findFirst(); ForgeVersion.CheckResult checkResult = ForgeVersion.getResult(modContainer.get()); if (checkResult.status == ForgeVersion.Status.OUTDATED) { ITextComponent updateMsg = new TextComponentString(TextFormatting.GOLD.toString() + "A new version of " + TextFormatting.DARK_GREEN.toString() + "PrettyNiceOres" + TextFormatting.GOLD.toString() + " is out! Go grab it " + TextFormatting.BLUE.toString() + "here!"); diff --git a/src/main/java/gtlp/prettyniceores/items/ItemOreDictCompatible.java b/src/main/java/gtlp/prettyniceores/items/ItemOreDictCompatible.java index 884f0c3..e516eb0 100644 --- a/src/main/java/gtlp/prettyniceores/items/ItemOreDictCompatible.java +++ b/src/main/java/gtlp/prettyniceores/items/ItemOreDictCompatible.java @@ -1,6 +1,6 @@ package gtlp.prettyniceores.items; -import gtlp.prettyniceores.PrettyNiceOres; +import gtlp.prettyniceores.Constants; import gtlp.prettyniceores.interfaces.IOreDictCompatible; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -18,7 +18,7 @@ public class ItemOreDictCompatible extends Item implements IOreDictCompatible { public ItemOreDictCompatible(String oreDictName) { super(); this.oreDictType = oreDictName; - setRegistryName(PrettyNiceOres.MOD_ID, oreDictType); + setRegistryName(Constants.MOD_ID, oreDictType); setUnlocalizedName(oreDictType); setCreativeTab(CreativeTabs.MATERIALS); } diff --git a/src/main/resources/assets/prettyniceores/blockstates/nice_lead_ore.json b/src/main/resources/assets/prettyniceores/blockstates/nice_lead_ore.json new file mode 100644 index 0000000..50dfcd5 --- /dev/null +++ b/src/main/resources/assets/prettyniceores/blockstates/nice_lead_ore.json @@ -0,0 +1,21 @@ +{ + "variants": { + "normal": [ + { + "model": "prettyniceores:nice_lead_ore" + }, + { + "model": "prettyniceores:nice_lead_ore", + "y": 90 + }, + { + "model": "prettyniceores:nice_lead_ore", + "y": 180 + }, + { + "model": "prettyniceores:nice_lead_ore", + "y": 270 + } + ] + } +} diff --git a/src/main/resources/assets/prettyniceores/blockstates/nice_silver_ore.json b/src/main/resources/assets/prettyniceores/blockstates/nice_silver_ore.json new file mode 100644 index 0000000..7d4dd6d --- /dev/null +++ b/src/main/resources/assets/prettyniceores/blockstates/nice_silver_ore.json @@ -0,0 +1,21 @@ +{ + "variants": { + "normal": [ + { + "model": "prettyniceores:nice_silver_ore" + }, + { + "model": "prettyniceores:nice_silver_ore", + "y": 90 + }, + { + "model": "prettyniceores:nice_silver_ore", + "y": 180 + }, + { + "model": "prettyniceores:nice_silver_ore", + "y": 270 + } + ] + } +} diff --git a/src/main/resources/assets/prettyniceores/blockstates/nice_tin_ore.json b/src/main/resources/assets/prettyniceores/blockstates/nice_tin_ore.json new file mode 100644 index 0000000..9f11527 --- /dev/null +++ b/src/main/resources/assets/prettyniceores/blockstates/nice_tin_ore.json @@ -0,0 +1,21 @@ +{ + "variants": { + "normal": [ + { + "model": "prettyniceores:nice_tin_ore" + }, + { + "model": "prettyniceores:nice_tin_ore", + "y": 90 + }, + { + "model": "prettyniceores:nice_tin_ore", + "y": 180 + }, + { + "model": "prettyniceores:nice_tin_ore", + "y": 270 + } + ] + } +} diff --git a/src/main/resources/assets/prettyniceores/lang/en_US.lang b/src/main/resources/assets/prettyniceores/lang/en_US.lang index d4675e7..2d3b39e 100644 --- a/src/main/resources/assets/prettyniceores/lang/en_US.lang +++ b/src/main/resources/assets/prettyniceores/lang/en_US.lang @@ -6,4 +6,7 @@ tile.nice_diamond_ore.name=Nice Diamond Ore tile.nice_emerald_ore.name=Nice Emerald Ore tile.nice_redstone_ore.name=Nice Redstone Ore tile.nice_copper_ore.name=Nice Copper Ore -tile.nice_netherquartz_ore.name=Nice Nether Quartz Ore \ No newline at end of file +tile.nice_netherquartz_ore.name=Nice Nether Quartz Ore +tile.nice_tin_ore.name=Nice Tin Ore +tile.nice_silver_ore.name=Nice Silver Ore +tile.nice_lead_ore.name=Nice Lead Ore \ No newline at end of file diff --git a/src/main/resources/assets/prettyniceores/models/block/nice_lead_ore.json b/src/main/resources/assets/prettyniceores/models/block/nice_lead_ore.json new file mode 100644 index 0000000..96b7e9d --- /dev/null +++ b/src/main/resources/assets/prettyniceores/models/block/nice_lead_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "prettyniceores:blocks/nice_lead_ore" + } +} diff --git a/src/main/resources/assets/prettyniceores/models/block/nice_silver_ore.json b/src/main/resources/assets/prettyniceores/models/block/nice_silver_ore.json new file mode 100644 index 0000000..9c9a461 --- /dev/null +++ b/src/main/resources/assets/prettyniceores/models/block/nice_silver_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "prettyniceores:blocks/nice_silver_ore" + } +} diff --git a/src/main/resources/assets/prettyniceores/models/block/nice_tin_ore.json b/src/main/resources/assets/prettyniceores/models/block/nice_tin_ore.json new file mode 100644 index 0000000..da29880 --- /dev/null +++ b/src/main/resources/assets/prettyniceores/models/block/nice_tin_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "prettyniceores:blocks/nice_tin_ore" + } +} diff --git a/src/main/resources/assets/prettyniceores/models/item/nice_lead_ore.json b/src/main/resources/assets/prettyniceores/models/item/nice_lead_ore.json new file mode 100644 index 0000000..32d0f78 --- /dev/null +++ b/src/main/resources/assets/prettyniceores/models/item/nice_lead_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "prettyniceores:block/nice_lead_ore" +} diff --git a/src/main/resources/assets/prettyniceores/models/item/nice_silver_ore.json b/src/main/resources/assets/prettyniceores/models/item/nice_silver_ore.json new file mode 100644 index 0000000..dab4c2a --- /dev/null +++ b/src/main/resources/assets/prettyniceores/models/item/nice_silver_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "prettyniceores:block/nice_silver_ore" +} diff --git a/src/main/resources/assets/prettyniceores/models/item/nice_tin_ore.json b/src/main/resources/assets/prettyniceores/models/item/nice_tin_ore.json new file mode 100644 index 0000000..3e25e23 --- /dev/null +++ b/src/main/resources/assets/prettyniceores/models/item/nice_tin_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "prettyniceores:block/nice_tin_ore" +} diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 3ba2b98..771eb3e 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -5,7 +5,7 @@ "description": "Adds pretty nice ores.", "version": "${version}", "mcversion": "${mcversion}", - "url": "", + "url": "http://minecraft.curseforge.com/projects/prettyniceores/files", "updateUrl": "", "authorList": ["GiantTree"], "credits": "GiantTree", diff --git a/versions.json b/versions.json index 48d58f4..8c8dcd3 100644 --- a/versions.json +++ b/versions.json @@ -1,9 +1,9 @@ { "homepage": "http://minecraft.curseforge.com/projects/prettyniceores/files", "promos": { - "1.9-latest": "1.9-0.3.5", - "1.9-recommended": "1.9-0.3.5", - "1.9.4-latest": "1.9.4-0.3.5", - "1.9.4-recommended": "1.9.4-0.3.5" + "1.9-latest": "1.9-0.3.6", + "1.9-recommended": "1.9-0.3.6", + "1.9.4-latest": "1.9.4-0.3.6", + "1.9.4-recommended": "1.9.4-0.3.6" } } \ No newline at end of file