From 519d75f3cd9ff8cbcbb2021ee56c25e6924f0f83 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 6 Sep 2015 18:11:17 +0100 Subject: [PATCH] Dandelifeon. --- .../api/subtile/SubTileGenerating.java | 17 ++ .../handler/SubTileRadiusRenderHandler.java | 1 - .../botania/common/block/BlockCell.java | 39 ++++ .../common/block/BlockSpecialFlower.java | 1 + .../botania/common/block/ModBlocks.java | 8 +- .../generating/SubTileDandelifeon.java | 189 ++++++++++++++++++ .../botania/common/block/tile/TileCell.java | 44 ++++ .../common/core/BotaniaCreativeTab.java | 1 + .../botania/common/lib/LibBlockNames.java | 2 + .../resources/assets/botania/lang/en_US.lang | 3 + .../botania/textures/blocks/cellBlock.png | Bin 0 -> 15719 bytes .../botania/textures/blocks/dandelifeon.png | Bin 0 -> 19286 bytes .../textures/blocks/dandelifeon.png.mcmeta | 5 + 13 files changed, 308 insertions(+), 2 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/block/BlockCell.java create mode 100644 src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java create mode 100644 src/main/java/vazkii/botania/common/block/tile/TileCell.java create mode 100644 src/main/resources/assets/botania/textures/blocks/cellBlock.png create mode 100644 src/main/resources/assets/botania/textures/blocks/dandelifeon.png create mode 100644 src/main/resources/assets/botania/textures/blocks/dandelifeon.png.mcmeta diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index 70c81e46f..f85ab0735 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -41,6 +41,8 @@ public class SubTileGenerating extends SubTileEntity { private static final String TAG_COLLECTOR_Z = "collectorZ"; protected int mana; + + public int redstoneSignal = 0; int sizeLastCheck = -1; protected TileEntity linkedCollector = null; @@ -48,6 +50,13 @@ public class SubTileGenerating extends SubTileEntity { ChunkCoordinates cachedCollectorCoordinates = null; + /** + * If set to true, redstoneSignal will be updated every tick. + */ + public boolean acceptsRedstone() { + return false; + } + @Override public void onUpdate() { super.onUpdate(); @@ -64,6 +73,14 @@ public class SubTileGenerating extends SubTileEntity { } emptyManaIntoCollector(); + if(acceptsRedstone()) { + redstoneSignal = 0; + for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + int redstoneSide = supertile.getWorldObj().getIndirectPowerLevelTo(supertile.xCoord + dir.offsetX, supertile.yCoord + dir.offsetY, supertile.zCoord + dir.offsetZ, dir.ordinal()); + redstoneSignal = Math.max(redstoneSignal, redstoneSide); + } + } + if(supertile.getWorldObj().isRemote) { double particleChance = 1F - (double) mana / (double) getMaxMana() / 3.5F; Color color = new Color(getColor()); diff --git a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java index 22e691ca9..620a2cfc9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java @@ -53,7 +53,6 @@ public final class SubTileRadiusRenderHandler { y = coords.posY; z = coords.posZ; } - } TileEntity tile = mc.theWorld.getTileEntity(x, y, z); diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java new file mode 100644 index 000000000..555f6c912 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -0,0 +1,39 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Sep 6, 2015, 4:03:56 PM (GMT)] + */ +package vazkii.botania.common.block; + +import java.util.ArrayList; + +import net.minecraft.block.material.Material; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import vazkii.botania.common.block.tile.TileCell; +import vazkii.botania.common.lib.LibBlockNames; + +public class BlockCell extends BlockModContainer { + + public BlockCell() { + super(Material.gourd); + setBlockName(LibBlockNames.CELL_BLOCK); + } + + @Override + public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + return new ArrayList(); + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return new TileCell(); + } + +} diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index c5dbef1eb..15c3f67a4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -70,6 +70,7 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid LibBlockNames.SUBTILE_GOURMARYLLIS, LibBlockNames.SUBTILE_NARSLIMMUS, LibBlockNames.SUBTILE_SPECTROLUS, + LibBlockNames.SUBTILE_DANDELIFEON, // Functional LibBlockNames.SUBTILE_JADED_AMARANTHUS, diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index fd15b727e..24ff42167 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -98,6 +98,7 @@ import vazkii.botania.common.block.subtile.functional.SubTileTangleberrie; import vazkii.botania.common.block.subtile.functional.SubTileTigerseye; import vazkii.botania.common.block.subtile.functional.SubTileVinculotus; import vazkii.botania.common.block.subtile.generating.SubTileArcaneRose; +import vazkii.botania.common.block.subtile.generating.SubTileDandelifeon; import vazkii.botania.common.block.subtile.generating.SubTileDaybloom; import vazkii.botania.common.block.subtile.generating.SubTileEndoflame; import vazkii.botania.common.block.subtile.generating.SubTileEntropinnyum; @@ -114,6 +115,7 @@ import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileBifrost; import vazkii.botania.common.block.tile.TileBrewery; import vazkii.botania.common.block.tile.TileCacophonium; +import vazkii.botania.common.block.tile.TileCell; import vazkii.botania.common.block.tile.TileCocoon; import vazkii.botania.common.block.tile.TileCraftCrate; import vazkii.botania.common.block.tile.TileEnchanter; @@ -246,6 +248,7 @@ public final class ModBlocks { public static Block cacophonium; public static Block bellows; public static Block bifrostPerm; + public static Block cellBlock; public static void init() { flower = new BlockModFlower(); @@ -329,7 +332,8 @@ public final class ModBlocks { cacophonium = new BlockCacophonium(); bellows = new BlockBellows(); bifrostPerm = new BlockBifrostPerm(); - + cellBlock = new BlockCell(); + ModFluffBlocks.init(); for(int i = 0; i < 16; i++) @@ -425,6 +429,7 @@ public final class ModBlocks { registerTile(TileLightRelay.class, LibBlockNames.LIGHT_RELAY); registerTile(TileCacophonium.class, LibBlockNames.CACOPHONIUM); registerTile(TileBellows.class, LibBlockNames.BELLOWS); + registerTile(TileCell.class, LibBlockNames.CELL_BLOCK); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_PUREDAISY, SubTilePureDaisy.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_MANASTAR, SubTileManastar.class); @@ -441,6 +446,7 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_GOURMARYLLIS, SubTileGourmaryllis.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_NARSLIMMUS, SubTileNarslimmus.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_SPECTROLUS, SubTileSpectrolus.class); + BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_DANDELIFEON, SubTileDandelifeon.class); registerSubTileWithMini(LibBlockNames.SUBTILE_BELLETHORN, SubTileBellethorn.class); BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_DREADTHORN, SubTileDreadthorn.class); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java new file mode 100644 index 000000000..335dd4903 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileDandelifeon.java @@ -0,0 +1,189 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Sep 6, 2015, 3:46:10 PM (GMT)] + */ +package vazkii.botania.common.block.subtile.generating; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import vazkii.botania.api.subtile.RadiusDescriptor; +import vazkii.botania.api.subtile.SubTileGenerating; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.TileCell; + +public class SubTileDandelifeon extends SubTileGenerating { + + private static final int RANGE = 12; + private static final int SPEED = 10; + private static final int MAX_GENERATIONS = 60; + private static final int MANA_PER_GEN = 80; + + private static final int[][] ADJACENT_BLOCKS = new int[][] { + { -1, -1 }, + { -1, +0 }, + { -1, +1 }, + { +0, +1 }, + { +1, +1 }, + { +1, +0 }, + { +1, -1 }, + { +0, -1 } + }; + + @Override + public void onUpdate() { + super.onUpdate(); + + if(!supertile.getWorldObj().isRemote && redstoneSignal > 0 && ticksExisted % SPEED == 0) + runSimulation(); + } + + void runSimulation() { + int[][] table = getCellTable(); + List changes = new ArrayList(); + + for(int i = 0; i < table.length; i++) + for(int j = 0; j < table[0].length; j++) { + int gen = table[i][j]; + int adj = getAdjCells(table, i, j); + + int newVal = gen; + if(adj < 2 || adj > 3) + newVal = -1; + else { + if(adj == 3 && gen == -1) + newVal = getSpawnCellGeneration(table, i, j); + else if(gen > -1) + newVal = gen + 1; + } + + if(Math.abs(i - RANGE) <= 1 && Math.abs(j - RANGE) <= 1 && newVal > -1) { + gen = newVal; + newVal = -2; + } + + if(newVal != gen) + changes.add(new int[] { i, j, newVal, gen }); + } + + int x = supertile.xCoord; + int y = supertile.yCoord; + int z = supertile.zCoord; + + for(int[] change : changes) { + int px = x - RANGE + change[0]; + int pz = z - RANGE + change[1]; + int val = change[2]; + int old = change[3]; + + setBlockForGeneration(px, y, pz, val, old); + } + } + + int[][] getCellTable() { + int diam = RANGE * 2 + 1; + int[][] table = new int[diam][diam]; + + int x = supertile.xCoord; + int y = supertile.yCoord; + int z = supertile.zCoord; + + for(int i = 0; i < diam; i++) + for(int j = 0; j < diam; j++) { + int px = x - RANGE + i; + int pz = z - RANGE + j; + table[i][j] = getCellGeneration(px, y, pz); + } + + return table; + } + + int getCellGeneration(int x, int y, int z) { + TileEntity tile = supertile.getWorldObj().getTileEntity(x, y, z); + if(tile instanceof TileCell) + return ((TileCell) tile).getGeneration(); + + return -1; + } + + int getAdjCells(int[][] table, int x, int z) { + int count = 0; + for(int[] shift : ADJACENT_BLOCKS) { + int xp = x + shift[0]; + int zp = z + shift[1]; + if(!isOffBounds(table, xp, zp)) { + int gen = table[xp][zp]; + if(gen >= 0) + count++; + } + } + + return count; + } + + int getSpawnCellGeneration(int[][] table, int x, int z) { + int max = -1; + for(int[] shift : ADJACENT_BLOCKS) { + int xp = x + shift[0]; + int zp = z + shift[1]; + if(!isOffBounds(table, xp, zp)) { + int gen = table[xp][zp]; + if(gen > max) + max = gen; + } + } + + return max == -1 ? -1 : max + 1; + } + + boolean isOffBounds(int[][] table, int x, int z) { + return x < 0 || z < 0 || x >= table.length || z >= table[0].length; + } + + void setBlockForGeneration(int x, int y, int z, int gen, int prevGen) { + World world = supertile.getWorldObj(); + Block blockAt = world.getBlock(x, y, z); + if(gen == -2) { + int val = prevGen * MANA_PER_GEN; + mana = Math.min(getMaxMana(), mana + val); + world.setBlockToAir(x, y, z); + } else if(blockAt == ModBlocks.cellBlock) { + if(gen < 0 || gen > MAX_GENERATIONS) + world.setBlockToAir(x, y, z); + else ((TileCell) world.getTileEntity(x, y, z)).setGeneration(gen); + } else if(gen >= 0 && blockAt.isAir(supertile.getWorldObj(), x, y, z)) { + world.setBlock(x, y, z, ModBlocks.cellBlock); + ((TileCell) world.getTileEntity(x, y, z)).setGeneration(gen); + } + } + + @Override + public boolean acceptsRedstone() { + return true; + } + + @Override + public RadiusDescriptor getRadius() { + return new RadiusDescriptor.Square(toChunkCoordinates(), RANGE); + } + + @Override + public int getMaxMana() { + return 50000; + } + + @Override + public int getColor() { + return 0x9c0a7e; + } + +} diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCell.java b/src/main/java/vazkii/botania/common/block/tile/TileCell.java new file mode 100644 index 000000000..a9f73fb69 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/tile/TileCell.java @@ -0,0 +1,44 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Sep 6, 2015, 4:07:16 PM (GMT)] + */ +package vazkii.botania.common.block.tile; + +import net.minecraft.nbt.NBTTagCompound; + +public class TileCell extends TileMod { + + private static final String TAG_GENERATION = "generation"; + + private int generation; + + @Override + public boolean canUpdate() { + return false; + } + + public void setGeneration(int gen) { + generation = gen; + } + + public int getGeneration() { + return generation; + } + + @Override + public void writeCustomNBT(NBTTagCompound cmp) { + cmp.setInteger(TAG_GENERATION, generation); + } + + @Override + public void readCustomNBT(NBTTagCompound cmp) { + generation = cmp.getInteger(TAG_GENERATION); + } + +} diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index b401ece68..91d6754f7 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -271,6 +271,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.corporeaCrystalCube); addBlock(ModBlocks.lightRelay); addBlock(ModBlocks.lightLauncher); + addBlock(ModBlocks.cellBlock); // FLUFF diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index b66a75803..6394bba62 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -97,6 +97,7 @@ public final class LibBlockNames { public static final String BELLOWS = "bellows"; public static final String BIFROST_PERM = "bifrostPerm"; public static final String PAVEMENT = "pavement"; + public static final String CELL_BLOCK = "cellBlock"; public static final String SUBTILE_PUREDAISY = "puredaisy"; public static final String SUBTILE_MANASTAR = "manastar"; @@ -113,6 +114,7 @@ public final class LibBlockNames { public static final String SUBTILE_GOURMARYLLIS = "gourmaryllis"; public static final String SUBTILE_NARSLIMMUS = "narslimmus"; public static final String SUBTILE_SPECTROLUS = "spectrolus"; + public static final String SUBTILE_DANDELIFEON = "dandelifeon"; public static final String SUBTILE_BELLETHORN = "bellethorn"; public static final String SUBTILE_DREADTHORN = "dreadthorn"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index c6df1c93f..5ad47b1e4 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1038,6 +1038,7 @@ tile.botania:pavement0Slab.name=White Portuguese Pavement Slab tile.botania:pavement1Slab.name=Black Portuguese Pavement Slab tile.botania:pavement2Slab.name=Blue Portuguese Pavement Slab tile.botania:pavement3Slab.name=Red Portuguese Pavement Slab +tile.botania:cellBlock.name=Cellular Block # FLOWER NAMES tile.botania:flower..name=Botania Flower @@ -1075,6 +1076,8 @@ tile.botania:flower.narslimmus.name=Narslimmus tile.botania:flower.narslimmus.reference=What's this? It's all sticky tile.botania:flower.spectrolus.name=Spectrolus tile.botania:flower.spectrolus.reference=Profiting off Hate +tile.botania:flower.dandelifeon.name=Dandelifeon +tile.botania:flower.dandelifeon.reference=C'est la vie # - FUNCTIONAL tile.botania:flower.bellethorn.name=Bellethorne diff --git a/src/main/resources/assets/botania/textures/blocks/cellBlock.png b/src/main/resources/assets/botania/textures/blocks/cellBlock.png new file mode 100644 index 0000000000000000000000000000000000000000..86ff1eed8604728a0948f2c5f6c34820058b1141 GIT binary patch literal 15719 zcmeI3e^?Xu9mh}b2WGfBM5KZmB6G5l++C6j<`$wzK+pz}9~E5bI4%dACb^iqkl>Hn z)+(s;ae~v1c4+JBP**#(wyun^+G*ynY9BXwo^DhpuC&w6wLaQ9SKM6^Li_^XxvhQr z&*gdYoBQWB6&5U*pqQ#a5M)Aro~20qo+!Oz#)_XaZr-EBuko(D zavnjxHc5JqLRy|rL=fXSwxmobvpz!7oI^v|xGF~DbGXFW2x6M+b5ZmPMo?BUHLNpJ zb)&sgrDScHs-=V#v%0dGS~hQ$n<-vZP(rU-K^twVxn_mQM~VUtMxc~Fhuz7OzD!j> zmlS_X!>CFbm?EsmRAosCm1WjKWj5z#l!S&*(-^K-W*9X%f$Qhs=}Ikz>rhOG;yN|1 zB{3t36Uxv_Wmbs4Om15>S!Br#r4y}8RjnYnNEG#Yy&A7h!?|lv+-NkSm=@J))#3~_ zU+)wspW4aK42lfsSQwsmvo3+=E;Kew6*f>`$Cvbc%H$uv=d&I=zo>;Bn+{3Qd;TSeG zFXYsT2tr7QjpR$}T?|^p@SMj@GdXqQrOX`e>IJrXaC7cck~|}>o$;|Fgh`%YSfCVw zJ7f~CmCSZCl)$-5IL>YkR$1WyLS=Tga`sZzY2&MV5NQiX zd!$AQN!vtegSHB*uGWfLxIwR`a6O@}(i2*>)~3UBRTySqD0)CTB7BJSVmB)ua+Ez{ zj(%mI^eLgf#b+Uxp_uvwoKJPw}sEI@bM(Y z1e%tlXz3s`(^4-mBH;T*2bUF&427{nH}JtI2lXSuN6z7`Wt^~v3Q7fLjV!`*)qCCsYU&0>nRNeo#0}s|h|HBT9bR2ypJ1|(gbS>qqVQgk} zplk;Q9&FQsTX}y!4IBeQ`_Cl(|BzzuigiQCEui^+o;|yrM5s z70{BC06^fTj0?^O@XELVAaGO01?K~JWn2IdxGCd;^8vgvE&vGJlySlN0A3jv00eHz zxZr#MuZ#--0ykw`a6W)n#svU@n=&pqAHXZ)0)W6x85f)n;FWO!K;Wi~3(g1d%D4a^ za8t$w=L2|UTmTTbDdU3k0lYFU00`Waal!cjUKtkv1a8W>;CukDj0*q)H)ULKK7d!o z1ptAYGA=kDz$@bdfWS=|7n~2^m2m+;;HHcV&Ij1bK2jg50?$et(D{9t=VL zR*4|wvj{SUYx@4lTm*@Z%eQ2e_}(=&E#i_GBeVT@c@5pErMU)%s@& zpHV~^3e%`J=?fF??Y%cTr3{HHJhnk)XdJU`VMRg;v1jA)-dT00e%w%Fx@|HigvWc{)LYMd=N2XVU+BKJlAPY$kJa>lGS=AAjQX=$G#-?0f%W z!IoQlqLeXFXXei9sBX@j^v-8TPaoOUoI0LuInvRw_164m(>Zo_6k#o1bIJdjBiWx7 zlXbUp-jevXhXk@Ad*`Q`#IHBRj*YH9`tZ#=$?M3Rg_{(WEwff8_tsBu-aE6P({yTO z@;_%hPLV&+epb87zq|jW`pWbb(OG1tv_;%DKzo%mA*0EQXH2lTC`seF5 z|D(Te_Y-U9ALFW8X5DVDXkGJh22<`-{B(!iL;hgfwoT5(_@(7>qepF-G9|HdQG)jz zJ0tcNj^{34Oxv0pJzi+AOj5=Qnn3^>q|{(y_R& z@;9eXk6#l1!n?0o_x9v2%x_9H-R*CDadzX4Gv_Y}F|X`xipjSNg)jY5uHk zPwZRDwe@c=KlUO&C$+=-6qWe=y58-n;~zUJE;PL>=B*$8aruUcQMays&{)@Qjn7Hk zd9qf2LT^3vXJ6~beGBXrHx8GjxAiP->%Nw_F)P`B{Lq%Z`q^i6VE=9F@BJ&{KaWoN6YAMsR1`nv+O4V93!1|x zFiXr+``AZjO?sn8li#$5ovISfkFtDlxqfbZ;z@S>Se_&v^8-^eA+GPJ!jn{K}{Q4SoNJv;Y7A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/botania/textures/blocks/dandelifeon.png b/src/main/resources/assets/botania/textures/blocks/dandelifeon.png new file mode 100644 index 0000000000000000000000000000000000000000..08169fc0fce46da65d617a363fd7fafff151d070 GIT binary patch literal 19286 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