From 9becd9b3e2c5cef3aca0cbda3a7406ce86c618a0 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 20 Nov 2015 22:25:04 +0100 Subject: [PATCH] Misc. Reconstructor Recipes, "added" Ethetic Quartz Blocks and made them craftable --- .../booklet/InitBooklet.java | 4 ++- .../chapter/BookletChapterReconstructor.java | 5 ++- .../config/ConfigCategories.java | 1 + .../config/values/ConfigCrafting.java | 2 ++ .../config/values/ConfigIntValues.java | 2 +- .../crafting/BlockCrafting.java | 2 +- .../actuallyadditions/ore/InitOreDict.java | 3 ++ .../recipe/ReconstructorRecipeHandler.java | 31 +++++++++++------- .../tile/TileEntityAtomicReconstructor.java | 4 +-- .../assets/actuallyadditions/lang/en_US.lang | 22 ++++++++----- .../blocks/blockTestifiBucksGreenWall.png | Bin 616 -> 593 bytes .../blocks/blockTestifiBucksWhiteWall.png | Bin 552 -> 409 bytes 12 files changed, 47 insertions(+), 29 deletions(-) diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java index 36a82fa93..cd55c3168 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/InitBooklet.java @@ -27,6 +27,7 @@ import ellpeck.actuallyadditions.items.metalists.TheFoods; import ellpeck.actuallyadditions.items.metalists.TheMiscItems; import ellpeck.actuallyadditions.items.metalists.TheSpecialDrops; import ellpeck.actuallyadditions.util.Util; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -55,12 +56,13 @@ public class InitBooklet{ //Getting Started chapterIntro = new BookletChapter("intro", entryGettingStarted, new ItemStack(InitItems.itemLexicon), new PageTextOnly(1), new PageTextOnly(2), new PageTextOnly(3)); new BookletChapter("bookTutorial", entryGettingStarted, new ItemStack(InitItems.itemLexicon), new PageTextOnly(1), new PageTextOnly(2), new PageCrafting(3, ItemCrafting.recipeBook)); - new BookletChapterReconstructor("crystals", entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), new PageTextOnly(1).addTextReplacement("", ConfigIntValues.RECONSTRUCTOR_USE_PER_BLOCK.getValue()), new PageTextOnly(2), new PagePicture(3, "pageAtomicReconstructor", 0).setNoText(), new PageTextOnly(4), new PageCrafting(5, BlockCrafting.recipeAtomicReconstructor).setNoText()).setSpecial(); + new BookletChapterReconstructor("crystals", entryGettingStarted, new ItemStack(InitBlocks.blockAtomicReconstructor), new PageTextOnly(1).addTextReplacement("", ConfigIntValues.RECONSTRUCTOR_BASE_ENERGY_USE.getValue()), new PageTextOnly(2), new PagePicture(3, "pageAtomicReconstructor", 0).setNoText(), new PageTextOnly(4), new PageCrafting(5, BlockCrafting.recipeAtomicReconstructor).setNoText()).setSpecial(); new BookletChapter("coalGen", entryGettingStarted, new ItemStack(InitBlocks.blockCoalGenerator), new PageCrafting(1, BlockCrafting.recipeCoalGen).addTextReplacement("", ConfigIntValues.COAL_GEN_ENERGY_PRODUCED.getValue())); new BookletChapter("craftingIngs", entryGettingStarted, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.COIL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeCoil).setNoText(), new PageCrafting(3, ItemCrafting.recipeCoilAdvanced).setNoText(), new PageCrafting(4, BlockCrafting.recipeCase).setNoText(), new PageCrafting(5, BlockCrafting.recipeStoneCase).setNoText(), new PageCrafting(6, BlockCrafting.recipeEnderPearlBlock).setNoText(), new PageCrafting(7, BlockCrafting.recipeEnderCase).setNoText(), new PageCrafting(8, ItemCrafting.recipeRing).setNoText(), new PageCrafting(9, ItemCrafting.recipeKnifeHandle).setNoText(), new PageCrafting(10, ItemCrafting.recipeKnifeBlade).setNoText(), new PageCrafting(11, ItemCrafting.recipeKnife).setNoText(), new PageCrafting(12, ItemCrafting.recipeDough).setNoText(), new PageCrafting(13, ItemCrafting.recipeRiceDough).setNoText(), new PageCrafting(14, BlockCrafting.recipeIronCase).setNoText()).setImportant(); //Miscellaneous new BookletChapter("quartz", entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), new PageTextOnly(1).setStack(new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.ORE_QUARTZ.ordinal())).addTextReplacement("", ConfigIntValues.BLACK_QUARTZ_MIN_HEIGHT.getValue()).addTextReplacement("", ConfigIntValues.BLACK_QUARTZ_MAX_HEIGHT.getValue()), new PageTextOnly(2).setStack(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal())), new PageCrafting(3, BlockCrafting.recipeQuartzBlock).setNoText(), new PageCrafting(4, BlockCrafting.recipeQuartzPillar).setNoText(), new PageCrafting(5, BlockCrafting.recipeQuartzChiseled).setNoText()); + new BookletChapter("miscReconstructor", entryMisc, new ItemStack(InitBlocks.blockTestifiBucksWhiteWall), new PageTextOnly(1), new PageReconstructor(2, new ItemStack(Blocks.soul_sand)).setNoText(), new PageReconstructor(3, new ItemStack(InitBlocks.blockTestifiBucksWhiteWall))).setImportant(); new BookletChapter("cloud", entryMisc, new ItemStack(InitBlocks.blockSmileyCloud), new PageTextOnly(1), new PageCrafting(2, BlockCrafting.recipeSmileyCloud).setNoText()).setSpecial(); new BookletChapter("coalStuff", entryMisc, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.TINY_COAL.ordinal()), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeTinyCoal).setNoText(), new PageCrafting(3, ItemCrafting.recipeTinyChar).setNoText(), new PageCrafting(4, BlockCrafting.recipeBlockChar).setNoText()); ArrayList lampPages = new ArrayList(); diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/chapter/BookletChapterReconstructor.java b/src/main/java/ellpeck/actuallyadditions/booklet/chapter/BookletChapterReconstructor.java index c0dad6212..1e63aba1d 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/chapter/BookletChapterReconstructor.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/chapter/BookletChapterReconstructor.java @@ -45,9 +45,8 @@ public class BookletChapterReconstructor extends BookletChapter{ } }.setNoText()); - for(ReconstructorRecipeHandler.Recipe recipe : ReconstructorRecipeHandler.recipes){ - BookletPage page = new PageReconstructor(allPages.size()+1, recipe.getFirstOutput()).setNoText(); - allPages.add(page); + for(int i = 0; i < ReconstructorRecipeHandler.RECIPES_FOR_BOOKLET_PAGE; i++){ + allPages.add(new PageReconstructor(allPages.size()+1, ReconstructorRecipeHandler.recipes.get(i).getFirstOutput()).setNoText()); } return allPages.toArray(new BookletPage[allPages.size()]); diff --git a/src/main/java/ellpeck/actuallyadditions/config/ConfigCategories.java b/src/main/java/ellpeck/actuallyadditions/config/ConfigCategories.java index 0be6bb9dd..88b4ea87f 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/ConfigCategories.java +++ b/src/main/java/ellpeck/actuallyadditions/config/ConfigCategories.java @@ -24,6 +24,7 @@ public enum ConfigCategories{ FLUIDS("Fluids", "Everything regarding fluids"), DRILL_VALUES("Drill Values", "Properties of Drills and their Upgrades"), CRUSHER_RECIPES("Crusher Recipes", "Recipes for the Crusher"), + RECONSTRUCTOR_RECIPES("Reconstructor Recipes", "Recipes for the Atomic Reconstructor"), ARMOR_VALUES("Armor Values", "Values for Armor"); public final String name; diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index 72219d99c..255016edb 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -146,6 +146,8 @@ public enum ConfigCrafting{ HORSE_ARMORS("Horse Armor -> Raw Materials", ConfigCategories.CRUSHER_RECIPES, "Crusher"), CRUSHER_MISC("Misc. Crusher Recipes like Bone Meal & Dyes", ConfigCategories.CRUSHER_RECIPES, "Crusher"), + RECONSTRUCTOR_MISC("Misc. Reconstructor Recipes like Soul Sand", ConfigCategories.RECONSTRUCTOR_RECIPES, "Reconstructor"), + TELE_STAFF("Tele Staff", ConfigCategories.ITEMS_CRAFTING), CASING("Casing", ConfigCategories.BLOCKS_CRAFTING), diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java index ab95f3cbc..caeb43e48 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigIntValues.java @@ -175,7 +175,7 @@ public enum ConfigIntValues{ RECONSTRUCTOR_DISTANCE("Atomic Reconstructor: Distance", ConfigCategories.MACHINE_VALUES, 10, 1, 50, "The max distance the Reconstructor goes forward to find blocks to convert"), RECONSTRCUTOR_RANGE("Atomic Reconstructor: Range", ConfigCategories.MACHINE_VALUES, 2, 1, 10, "The range of Converting blocks or items into other blocks or items"), - RECONSTRUCTOR_USE_PER_BLOCK("Atomic Reconstructor: Energy Use per Block", ConfigCategories.MACHINE_VALUES, 800, 0, 100000, "The base amount of Energy the Reconstructor uses per Block converted"), + RECONSTRUCTOR_BASE_ENERGY_USE("Atomic Reconstructor: Base Energy Use", ConfigCategories.MACHINE_VALUES, 200, 0, 100000, "The base amount of Energy the Reconstructor uses per laser shot (extra energy, determined by the recipe, is used per conversion)"), RECONSTRUCTOR_COOLDOWN_TIMER("Atomic Reconstrucor: Cooldown Timer", ConfigCategories.MACHINE_VALUES, 100, 0, 10000, "The amount of time the Reconstructor waits between shooting lasers"), TILE_ENTITY_UPDATE_INTERVAL("Tile Entities: Update Interval", ConfigCategories.OTHER, 5, 1, 100, "The amount of ticks waited before a TileEntity sends an additional Update to the Client"); diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java index 2a535bbc8..5a9e687f5 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -86,7 +86,7 @@ public class BlockCrafting{ if(ConfigCrafting.ATOMIC_RECONSTRUCTOR.isEnabled()){ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockAtomicReconstructor), "IRI", "RCR", "IRI", - 'R', "dustRedstone", + 'R', "blockRedstone", 'I', "ingotIron", 'C', new ItemStack(InitBlocks.blockMisc, 1, TheMiscBlocks.IRON_CASING.ordinal()))); recipeAtomicReconstructor = Util.GetRecipes.lastIRecipe(); diff --git a/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java b/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java index 129dd552f..c38b7d41c 100644 --- a/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java +++ b/src/main/java/ellpeck/actuallyadditions/ore/InitOreDict.java @@ -40,6 +40,7 @@ public class InitOreDict{ addOre(Items.dye, 15, "boneMeal"); addOre(Items.sugar, "sugar"); addOre(Items.reeds, "sugarCane"); + addOre(Blocks.soul_sand, "soulSand"); addOre(Blocks.yellow_flower, "flowerDandelion"); addOre(Blocks.red_flower, "flowerPoppy"); @@ -104,6 +105,8 @@ public class InitOreDict{ addOre(InitItems.itemMisc, TheMiscItems.QUARTZ.ordinal(), "gemQuartzBlack"); addOre(InitItems.itemMisc, TheMiscItems.BLACK_DYE.ordinal(), "dyeBlack"); + + addOre(InitBlocks.blockTestifiBucksWhiteWall, "blockWhiteBrick"); } private static void addOre(ItemStack stack, String name){ diff --git a/src/main/java/ellpeck/actuallyadditions/recipe/ReconstructorRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/recipe/ReconstructorRecipeHandler.java index 88530e90a..860e5778e 100644 --- a/src/main/java/ellpeck/actuallyadditions/recipe/ReconstructorRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/recipe/ReconstructorRecipeHandler.java @@ -10,6 +10,7 @@ package ellpeck.actuallyadditions.recipe; +import ellpeck.actuallyadditions.config.values.ConfigCrafting; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -20,21 +21,27 @@ import java.util.Objects; public class ReconstructorRecipeHandler{ public static ArrayList recipes = new ArrayList(); + public static final int RECIPES_FOR_BOOKLET_PAGE = 12; public static void init(){ - addRecipe("blockRedstone", "blockCrystalRed", 200); - addRecipe("blockLapis", "blockCrystalBlue", 200); - addRecipe("blockDiamond", "blockCrystalLightBlue", 600); - addRecipe("blockEmerald", "blockCrystalGreen", 1000); - addRecipe("blockCoal", "blockCrystalBlack", 400); - addRecipe("blockIron", "blockCrystalWhite", 300); + addRecipe("blockRedstone", "blockCrystalRed", 400); + addRecipe("blockLapis", "blockCrystalBlue", 400); + addRecipe("blockDiamond", "blockCrystalLightBlue", 6000); + addRecipe("blockEmerald", "blockCrystalGreen", 10000); + addRecipe("blockCoal", "blockCrystalBlack", 600); + addRecipe("blockIron", "blockCrystalWhite", 800); - addRecipe("dustRedstone", "crystalRed", 20); - addRecipe("gemLapis", "crystalBlue", 20); - addRecipe("gemDiamond", "crystalLightBlue", 60); - addRecipe("gemEmerald", "crystalGreen", 100); - addRecipe("coal", "crystalBlack", 40); - addRecipe("ingotIron", "crystalWhite", 30); + addRecipe("dustRedstone", "crystalRed", 40); + addRecipe("gemLapis", "crystalBlue", 40); + addRecipe("gemDiamond", "crystalLightBlue", 600); + addRecipe("gemEmerald", "crystalGreen", 1000); + addRecipe("coal", "crystalBlack", 60); + addRecipe("ingotIron", "crystalWhite", 80); + + if(ConfigCrafting.RECONSTRUCTOR_MISC.isEnabled()){ + addRecipe("sand", "soulSand", 20000); + addRecipe("blockQuartz", "blockWhiteBrick", 10); + } } public static void addRecipe(String input, String output, int energyUse){ diff --git a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityAtomicReconstructor.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityAtomicReconstructor.java index b74e1932f..e3c80541b 100644 --- a/src/main/java/ellpeck/actuallyadditions/tile/TileEntityAtomicReconstructor.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityAtomicReconstructor.java @@ -33,7 +33,7 @@ import java.util.ArrayList; public class TileEntityAtomicReconstructor extends TileEntityBase implements IEnergyReceiver{ - public EnergyStorage storage = new EnergyStorage(300000); + public EnergyStorage storage = new EnergyStorage(3000000); private int currentTime; @@ -42,7 +42,7 @@ public class TileEntityAtomicReconstructor extends TileEntityBase implements IEn public void updateEntity(){ super.updateEntity(); if(!this.worldObj.isRemote){ - int baseUse = ConfigIntValues.RECONSTRUCTOR_USE_PER_BLOCK.getValue(); + int baseUse = ConfigIntValues.RECONSTRUCTOR_BASE_ENERGY_USE.getValue(); if(!worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord) && this.storage.getEnergyStored() >= baseUse){ if(this.currentTime > 0){ this.currentTime--; diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index af99fdeb2..394e58993 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -87,12 +87,12 @@ tile.actuallyadditions.blockWildCanola.name=Wild Canola tile.actuallyadditions.blockWildRice.name=Wild Rice tile.actuallyadditions.blockWildCoffee.name=Wild Coffee tile.actuallyadditions.blockWildFlax.name=Wild Flax -tile.actuallyadditions.blockTestifiBucksGreenWall.name=Green TB Block -tile.actuallyadditions.blockTestifiBucksWhiteWall.name=White TB Block -tile.actuallyadditions.blockTestifiBucksGreenStairs.name=Green TB Stairs -tile.actuallyadditions.blockTestifiBucksWhiteStairs.name=White TB Stairs -tile.actuallyadditions.blockTestifiBucksGreenSlab.name=Green TB Slab -tile.actuallyadditions.blockTestifiBucksWhiteSlab.name=White TB Slab +tile.actuallyadditions.blockTestifiBucksGreenWall.name=Ethetic Green Block +tile.actuallyadditions.blockTestifiBucksWhiteWall.name=Ethetic Quartz +tile.actuallyadditions.blockTestifiBucksGreenStairs.name=Ethetic Green Stairs +tile.actuallyadditions.blockTestifiBucksWhiteStairs.name=Ethetic Quartz Stairs +tile.actuallyadditions.blockTestifiBucksGreenSlab.name=Ethetic Green Slab +tile.actuallyadditions.blockTestifiBucksWhiteSlab.name=Ethetic Quartz Slab tile.actuallyadditions.blockCanola.name=Canola Plant tile.actuallyadditions.blockTreasureChest.name=Treasure Chest tile.actuallyadditions.blockCanolaPress.name=Canola Press @@ -115,8 +115,8 @@ tile.actuallyadditions.blockRangedCollector.name=Ranged Collector tile.actuallyadditions.blockLaserRelay.name=Laser Relay tile.actuallyadditions.blockMiscIronCasing.name=Iron Casing tile.actuallyadditions.blockBlackLotus.name=Black Lotus -tile.actuallyadditions.blockTestifiBucksWhiteFence.name=White TB Wall -tile.actuallyadditions.blockTestifiBucksGreenFence.name=Green TB Wall +tile.actuallyadditions.blockTestifiBucksWhiteFence.name=Ethetic Quartz Wall +tile.actuallyadditions.blockTestifiBucksGreenFence.name=Ethetic Green Wall tile.actuallyadditions.blockAtomicReconstructor.name=Atomic Reconstructor tile.actuallyadditions.blockCrystalRed.name=Restonia Crystal Block tile.actuallyadditions.blockCrystalBlue.name=Palis Crystal Block @@ -597,10 +597,14 @@ booklet.actuallyadditions.chapter.blackLotus.text.2=No, not that one, Vaz booklet.actuallyadditions.chapter.crystals.name=Crystals and Reconstructor booklet.actuallyadditions.chapter.crystals.text.1=For many Crafting Operations in Actually Additions, you will need Crystals or Crystal Blocks. These can be made using an Atomic Reconstructor. Just place one down facing in any direction and it will shoot out a red laser. When placing some of the blocks shown on the following pages in front of the laser, they will be converted into Crystals. During the shooting of a laser and one conversion, it uses at least RF, but the rate varies depending on the converted block. -booklet.actuallyadditions.chapter.crystals.text.2=The way this works is that the laser searches for a block, and when it finds one, it converts all blocks and items on the ground in that area into their Crystal forms (if they have one!). When trying to power the Reconstructor, at first you will notice that many power sources require crystals to be crafted. Not to worry, though, as you can use Coal Generators to create your first couple of crystals before you can upgrade to better sources. +booklet.actuallyadditions.chapter.crystals.text.2=When hitting a block with the Laser, it will convert the other blocks around it, too. This includes items on the ground. When trying to power the Reconstructor, you will notice that many generators require crystals. Not to worry, though, as you can use Coal Generators to create your first couple of crystals before you can upgrade to better sources. For additional Reconstructor Recipes, see the "Useful Reconstructor Recipes" Entry. booklet.actuallyadditions.chapter.crystals.text.4=When you have crafted a couple of items, you might want to find a way to automate this. There is a very simple way to do accomplish this: Place the Atomic Reconstructor down facing into a Precision Dropper (to find it, look it up in the All Items and Search Entry!). Next, place a Ranged Collector in the area that has the converted items set as a whitelist. Now you can just chuck your raw materials into the Dropper to convert them! booklet.actuallyadditions.chapter.bookTutorial.name=Intro to the Manual booklet.actuallyadditions.chapter.bookTutorial.text.1=The Actually Additions Manual is very versatile. Here is a quick overview: Entries & ChaptersAn Entry is a general topic while a Chapter is almost always pointed to a specific item. When closing a chapter, the index opens, when closing that, the front page will. BookmarksBookmarks, as seen on the bottom of the booklet, store the current page when clicked and can restore said page when clicked again. This can be very useful for easy navigation. booklet.actuallyadditions.chapter.bookTutorial.text.2=The Buttons at the top right lead you to the Achievements or Configuration Screen. When looking at a chapter that is somehow connected to an achievement, a speech bubble that you can hover over to see the Achievement in question will point to the Achievements Button. The Buttons on the top left can be used to be directed to various Webpages that have to do with the mod. When an update is available, a button to download it will also show up on the top left. booklet.actuallyadditions.chapter.bookTutorial.text.3=If you, for some reason, want to craft this book again, just take a piece of paper and a canola seed which you can find randomly generated and craft them together! + +booklet.actuallyadditions.chapter.miscReconstructor.name=Useful Reconstructor Recipes +booklet.actuallyadditions.chapter.miscReconstructor.text.1=There are some additional recipes for the Atomic Reconstructor that could be very useful to you. These include decor blocks and items as well as some useful conversions. Flip through the following pages to see them all. +booklet.actuallyadditions.chapter.miscReconstructor.text.3=The Ethetic Quartz Blocks are Quartz Blocks spruced up. They can be crafted into stairs, slabs and walls with the same recipes as cobblestone has. No, not misspelled \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockTestifiBucksGreenWall.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockTestifiBucksGreenWall.png index febe577a0ed206159f5ae375fb32c4cdbf555c75..8888a3cdeb8cf9c7e2c4fac42874101b4271d7f1 100644 GIT binary patch delta 568 zcmV-80>}O61knVLB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XS z000XS0e@s)kpKVy2XskIMF-yt6cr3Fnx5uO0000ObVXQnQ*UN;cVTj60B~VxZgehg zWpp4kE-)@O{ETDY00056NklCIe&>I#d(%wDZAYN0_6XK z@ylWcXsW8K8z}o%8}(eOh7o;1D zt7OLCfE8oiA8l;!h)V*uv+gDV@2F^L_d0aZ?*Lvs!4Oz?*L)RW<2&x+1cAzad(=@v zz-}x_4cE!q4t!QTSui+1gY8ST33=^{PQ9Umo3y9SO7*?+WF<7T2^M{mTWk;Z8FbU+{* ze4fMIl7DP|-9q+e zkTyO7fks^!vna;PJe9A=8>K(K?b9wZUXSEjFb(k0(ALzs@P9OrTSH5eOX01lkA~Lw zxNe131NkhN1V0*D-5=Mcy?^!iR(NA_E?5{YLDRsoBuoJX$hg1}nHx6L9AdDc zr2r^G6-W@kMSlQD0v4(8xOwCGza5rH3(vPbe{EmynK1mS4pTuRO>V(h=c$Qq6DVj$A1P7qMSR01|d9cPyBP;V*yTY znji~T&ymIPy63Pw;TX|n@#o^i@$vu_GIXpVRD=4eP6tSJ4llO{9;ffb!MLwn)lHP@ z_s|e>XHN@*?~ZjSiVD#db dS(id<^AlGYG+t-ebteD-002ovPDHLkV1k`83EThx diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockTestifiBucksWhiteWall.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockTestifiBucksWhiteWall.png index a93c693edb61986bfb1e836595828fcaec06e571..8d329e28f9900587d61605b5c662f96d5bf3f0e7 100644 GIT binary patch delta 382 zcmV-^0fGLg1epVnB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000XS z000XS0e@s)kpKVy2XskIMF-yt6cr8(3eWYu0000ObVXQnQ*UN;cVTj60B~VxZgehg zWpp4kE-)@O{ETDY0002@Nkl@4ctU9x;4P8e|H<>$s50b)J4VAL^Yw7Pvj9Gael>$Bw1@* zu}0y~gHVMUId=_pH6b@X7!dAGKu}!GU$B!32COGiWi{{a60|De66lK=n!32;bRa{vGf5&!@T5&_cPe*6Fc z00(qQO+^Ra3ltR&3<}Tny#N3KwMj%lR5;6JlTm9VArOSWYoi%v5k(l-|Nq1CykUtb zvV++{?;iG)%-xf%ZB^NA^{vDQxV7~_fT?Q*#wA^;d;08mP?EDJej-rwJ8tzoT2 zDTQ;6<2YE?mEJpVB7#y1fY#cK_kAaXKx>T{Bipu}@?AT)LQ5B0p65S z7-M)opJ=TIE3Gwp?`W-ODTC}dj=9QUG{%rp!h1h!9AK?A!1T&c*IFY(_4#~G=AS<^ zz(Y|fHP4h%$N-g62qByr)LO$Bb9#|;j{E&S1w<*u{eOPPdp{Khp!d$>@tBH3Y}+v@MnqoC`p0m+_m^MBz-X=iyEKTj)+aOd-U%VF?>ln6UdcI6`wr^@ zq?EW^F2oqAwa$D>X_Cp;*B9Hi%_;jiy54(kw;RqmYOSp6${78eGuB%E0JG3H_^%PP Ri2wiq00>D%PDHLkV1kA9`)&XL