From ae6af3d1825498a173ee226aa3ef9a7c655ce096 Mon Sep 17 00:00:00 2001 From: ShadowFox Date: Wed, 21 Oct 2015 09:10:02 -0600 Subject: [PATCH] Painting the town: Adding Paintslinger API support --- .gitignore | 28 +++++++++++++++++++ .../java/vazkii/botania/api/BotaniaAPI.java | 15 ++++++++++ .../botania/common/block/ModBlocks.java | 3 ++ .../botania/common/item/lens/LensPaint.java | 14 ++-------- 4 files changed, 48 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 7aac815e2..518ba98a2 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,31 @@ Thumbs.db *.jar !/gradle/wrapper/gradle-wrapper.jar !GardenOfGlass.jar + +### OSX (adds a lot of garbage)### +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 55d9df398..8c627f937 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -84,6 +84,7 @@ public final class BotaniaAPI { public static Map oreWeightsNether = new HashMap(); public static Map seeds = new HashMap(); public static Set looniumBlacklist = new LinkedHashSet(); + public static Set paintableBlocks = new LinkedHashSet(); public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", 16, new int[] { 2, 6, 5, 2 }, 18); public static ToolMaterial manasteelToolMaterial = EnumHelper.addToolMaterial("MANASTEEL", 3, 300, 6.2F, 2F, 20); @@ -228,6 +229,12 @@ public final class BotaniaAPI { registerModWiki("GanysSurface", new SimpleWikiProvider("Gany's Surface Wiki", "http://ganys-surface.wikia.com/wiki/%s")); registerModWiki("GanysNether", new SimpleWikiProvider("Gany's Nether Wiki", "http://ganys-nether.wikia.com/wiki/%s")); registerModWiki("GanysEnd", new SimpleWikiProvider("Gany's End Wiki", "http://ganys-end.wikia.com/wiki/%s")); + + registerPaintableBlock(Blocks.stained_glass); + registerPaintableBlock(Blocks.stained_glass_pane); + registerPaintableBlock(Blocks.stained_hardened_clay); + registerPaintableBlock(Blocks.wool); + registerPaintableBlock(Blocks.carpet); } /** @@ -267,6 +274,14 @@ public final class BotaniaAPI { return fallbackBrew; } + /** + * Registers a paintableBlock and returns it. + */ + public static Block registerPaintableBlock(Block paintable){ + paintableBlocks.add(paintable); + return paintable; + } + /** * Registers a Petal Recipe. * @param output The ItemStack to craft. diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 6f5c58b78..62624b9ec 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -392,6 +392,9 @@ public final class ModBlocks { OreDictionary.registerOre("chestWood", Blocks.chest); OreDictionary.registerOre("craftingTableWood", Blocks.crafting_table); + BotaniaAPI.registerPaintableBlock(unstableBlock); + BotaniaAPI.registerPaintableBlock(manaBeacon); + initTileEntities(); } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index fe5d57473..361dc389a 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -22,23 +22,13 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; public class LensPaint extends Lens { - static final List paintableBlocks = new ArrayList() {{ - add(Blocks.stained_glass); - add(Blocks.stained_glass_pane); - add(Blocks.stained_hardened_clay); - add(Blocks.wool); - add(Blocks.carpet); - add(ModBlocks.unstableBlock); - add(ModBlocks.manaBeacon); - } - }; - @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) { int storedColor = ItemLens.getStoredColor(stack); @@ -54,7 +44,7 @@ public class LensPaint extends Lens { dead = true; } else { Block block = entity.worldObj.getBlock(pos.blockX, pos.blockY, pos.blockZ); - if(paintableBlocks.contains(block)) { + if(BotaniaAPI.paintableBlocks.contains(block)) { int meta = entity.worldObj.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ); List coordsToPaint = new ArrayList(); List coordsFound = new ArrayList();