From 1ca041a29f453bde2d444de2567cd2b133f488ea Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 29 Mar 2015 23:44:48 -0700 Subject: [PATCH] Revert "Close #441 Add Underground Biomes Constructs integration" This reverts commit b3b1a6a415cf2309d65bd700dcfcdc1c5cf36ae8. Conflicts: lang src/main/java/forestry/Forestry.java src/main/java/forestry/plugins/PluginManager.java --- build.gradle | 5 -- lang | 2 +- .../undergroundBiomes/api/UBAPIHook.java | 11 --- .../api/UBOreTexturizer.java | 65 ------------------ src/main/java/forestry/Forestry.java | 3 +- .../java/forestry/plugins/PluginManager.java | 1 - .../plugins/PluginUndergroundBiomes.java | 52 -------------- .../textures/blocks/ores/apatite_overlay.png | Bin 1198 -> 0 bytes .../textures/blocks/ores/copper_overlay.png | Bin 1199 -> 0 bytes .../textures/blocks/ores/tin_overlay.png | Bin 1194 -> 0 bytes 10 files changed, 2 insertions(+), 137 deletions(-) delete mode 100644 src/main/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java delete mode 100644 src/main/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java mode change 100755 => 100644 src/main/java/forestry/Forestry.java mode change 100755 => 100644 src/main/java/forestry/plugins/PluginManager.java delete mode 100644 src/main/java/forestry/plugins/PluginUndergroundBiomes.java delete mode 100644 src/main/resources/assets/forestry/textures/blocks/ores/apatite_overlay.png delete mode 100644 src/main/resources/assets/forestry/textures/blocks/ores/copper_overlay.png delete mode 100644 src/main/resources/assets/forestry/textures/blocks/ores/tin_overlay.png diff --git a/build.gradle b/build.gradle index 175a988e7..d3175fa11 100755 --- a/build.gradle +++ b/build.gradle @@ -197,7 +197,6 @@ task mainJarSigned ( type: Jar, dependsOn: 'reobf' ) { from (zipTree(jar.getArchivePath())) { exclude '**/api/**' exclude '**/codechicken/**' - exclude '**/undergroundBiomes/**' } duplicatesStrategy = DuplicatesStrategy.EXCLUDE @@ -224,7 +223,6 @@ task mainJar ( type: Zip, dependsOn: mainJarSigned ) { from (zipTree(jar.getArchivePath())) { include '**' exclude '**/codechicken/**' - exclude '**/undergroundBiomes/**' } duplicatesStrategy = DuplicatesStrategy.EXCLUDE @@ -237,7 +235,6 @@ task devJarSigned ( type: Jar, dependsOn: 'classes' ) { from(sourceSets.main.output) { exclude '**/api/**' exclude '**/codechicken/**' - exclude '**/undergroundBiomes/**' } destinationDir = file("build/tmp") @@ -263,13 +260,11 @@ task devJar ( type: Zip, dependsOn: devJarSigned ) { from(sourceSets.main.allSource) { include '**' exclude '**/codechicken/**' - exclude '**/undergroundBiomes/**' } from(sourceSets.main.output) { include '**' exclude '**/codechicken/**' - exclude '**/undergroundBiomes/**' } duplicatesStrategy = DuplicatesStrategy.EXCLUDE diff --git a/lang b/lang index c0000f077..fa0f81998 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit c0000f0774692627d198bdd733a6c18679876a2e +Subproject commit fa0f81998bce75b242fdc80118c9e32f3e156d15 diff --git a/src/main/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java b/src/main/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java deleted file mode 100644 index 13279ef64..000000000 --- a/src/main/java/exterminatorJeff/undergroundBiomes/api/UBAPIHook.java +++ /dev/null @@ -1,11 +0,0 @@ -package exterminatorJeff.undergroundBiomes.api; - -/** - * Striped down version, get the full API from here: https://github.com/Zeno410/UndergroundBiomes1.7API - * @author Zeno410 - */ -public class UBAPIHook { - public static final UBAPIHook ubAPIHook = new UBAPIHook(); - //public UBDimensionalStrataColumnProvider dimensionalStrataColumnProvider; // set in the main Underground Biomes - public UBOreTexturizer ubOreTexturizer; -} diff --git a/src/main/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java b/src/main/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java deleted file mode 100644 index c036de0a1..000000000 --- a/src/main/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java +++ /dev/null @@ -1,65 +0,0 @@ -package exterminatorJeff.undergroundBiomes.api; - -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import net.minecraft.block.Block; -import net.minecraft.world.World; - -/** - * Striped down version, get the full API from here: https://github.com/Zeno410/UndergroundBiomes1.7API - * This is an interface for the class that can create Underground Biomes versions of arbitary ores - * It creates three new blocks for each texturized ore. - * @author Zeno410 - */ -public interface UBOreTexturizer { - // usage: Block is the ore block. - // Overlay name is the fully qualified name, e.g. modname:overlayName - // that static vars are fully qualified names for all the textures in the UB pack, just pass as is - // the event isn't needed per se, but if this is called anytime else, the blocks will not "stick" - public void setupUBOre(Block oreBlock, String overlayName, FMLPreInitializationEvent event); - public void setupUBOre(Block oreBlock, int metadata, String overlayName, FMLPreInitializationEvent event); - public void setupUBOre(Block oreBlock, int metadata, String overlayName, String blockName, FMLPreInitializationEvent event); - - public void requestUBOreSetup(Block oreBlock, String overlayName) throws BlocksAreAlreadySet; - public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName) throws BlocksAreAlreadySet; - public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName, String blockName) throws BlocksAreAlreadySet; - public void redoOres(int xInBlockCoordinates, int zInBlockCoordinates, World serverSideWorld) ; - - public static String amber_overlay = "undergroundbiomes:amber_overlay"; - public static String cinnabar_overlay = "undergroundbiomes:cinnabar_overlay"; - public static String coal_overlay = "undergroundbiomes:coal_overlay"; - public static String copper_overlay = "undergroundbiomes:copper_overlay"; - public static String diamond_overlay = "undergroundbiomes:diamond_overlay"; - public static String emerald_overlay = "undergroundbiomes:emerald_overlay"; - public static String gold_overlay = "undergroundbiomes:gold_overlay"; - public static String iron_overlay = "undergroundbiomes:iron_overlay"; - public static String lapis_overlay = "undergroundbiomes:lapis_overlay"; - public static String lead_overlay = "undergroundbiomes:lead_overlay"; - public static String olivine_peridot_overlay = "undergroundbiomes:olivine-peridot_overlay"; - public static String redstone_overlay = "undergroundbiomes:redstone_overlay"; - public static String ruby_overlay = "undergroundbiomes:ruby_overlay"; - public static String sapphire_overlay = "undergroundbiomes:sapphire_overlay"; - public static String tin_overlay = "undergroundbiomes:tin_overlay"; - public static String uranium_overlay = "undergroundbiomes:uranium_overlay"; - - public class BlocksAreAlreadySet extends RuntimeException { - // this is thrown if UB has already run its pre-initialization step and can no longer register blocks - public final Block oreBlock; - public final String overlayName; - - public BlocksAreAlreadySet(Block oreBlock, String overlayName) { - this.oreBlock = oreBlock; - this.overlayName = overlayName; - } - - @Override - public String toString() { - String blockDescription = "undefined block"; - String overlayDescription = "undefined overlay"; - if (oreBlock != null) blockDescription = oreBlock.getUnlocalizedName(); - if (overlayName != null) overlayDescription = overlayName; - return "Attempt to create Underground Biomes ore for "+blockDescription+" with "+overlayDescription + - " after blocks have already been defined"; - } - - } -} diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java old mode 100755 new mode 100644 index af8b6d904..a0d6dfd11 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -60,8 +60,7 @@ import forestry.core.utils.StringUtil; + "after:Buildcraft|Core@[6.1.7,);" + "after:ExtrabiomesXL;" + "after:BiomesOPlenty;" - + "after:IC2@[2.0.140,);" - + "before:UndergroundBiomes") + + "after:IC2@[2.0.140,);") //, certificateFingerprint = Version.FINGERPRINT) public class Forestry { diff --git a/src/main/java/forestry/plugins/PluginManager.java b/src/main/java/forestry/plugins/PluginManager.java old mode 100755 new mode 100644 index f5435d234..8456397e2 --- a/src/main/java/forestry/plugins/PluginManager.java +++ b/src/main/java/forestry/plugins/PluginManager.java @@ -95,7 +95,6 @@ public class PluginManager { MAGICALCROPS(new PluginMagicalCrops()), NATURA(new PluginNatura()), PLANTMEGAPACK(new PluginPlantMegaPack()), - UNDERGROUND_BIOMES(new PluginUndergroundBiomes()), WITCHERY(new PluginWitchery()); private final ForestryPlugin instance; diff --git a/src/main/java/forestry/plugins/PluginUndergroundBiomes.java b/src/main/java/forestry/plugins/PluginUndergroundBiomes.java deleted file mode 100644 index 5bc51bc16..000000000 --- a/src/main/java/forestry/plugins/PluginUndergroundBiomes.java +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.plugins; - -import cpw.mods.fml.common.Optional; - -import forestry.core.config.Defaults; -import forestry.core.config.ForestryBlock; -import forestry.core.proxy.Proxies; - -import exterminatorJeff.undergroundBiomes.api.UBAPIHook; -import exterminatorJeff.undergroundBiomes.api.UBOreTexturizer; - -@Plugin(pluginID = "UndergroundBiomes", name = "UndergroundBiomes", author = "mezz", url = Defaults.URL, unlocalizedDescription = "for.plugin.undergroundBiomes.description") -public class PluginUndergroundBiomes extends ForestryPlugin { - - public boolean isAvailable() { - return Proxies.common.isModLoaded("UndergroundBiomes"); - } - - public String getFailMessage() { - return "UndergroundBiomes is not found."; - } - - @Optional.Method(modid = "UndergroundBiomes") - @Override - protected void preInit() { - registerBlock(0, "apatite"); - registerBlock(1, "copper"); - registerBlock(2, "tin"); - } - - @Optional.Method(modid = "UndergroundBiomes") - private void registerBlock(int meta, String textureName) { - try { - String blockName = ForestryBlock.resources.getItemStack(1, meta).getUnlocalizedName(); - UBAPIHook.ubAPIHook.ubOreTexturizer.requestUBOreSetup(ForestryBlock.resources.block(), meta, "forestry:ores/" + textureName + "_overlay", blockName); - } catch (UBOreTexturizer.BlocksAreAlreadySet exception) { - Proxies.log.severe(exception.toString()); - } catch (Throwable throwable) { - Proxies.log.severe("Underground Biomes crashed."); - } - } -} diff --git a/src/main/resources/assets/forestry/textures/blocks/ores/apatite_overlay.png b/src/main/resources/assets/forestry/textures/blocks/ores/apatite_overlay.png deleted file mode 100644 index 0b954739991a23844649e96804ce5e5a32391bc6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1198 zcma)5T}TvB7#*^}L@6r6f?^mWD%+i%%^i0qH*t5?+-z;zU2!22XJ@YNpfh)xxwfMa zq?Xl#P!jzR6+%(H*bnt!g`uHkEg{iUCE-IsJ($^RV0X;59@^+KGxvvc&UfzjeRC>Y zySpH7eI7v&1;J`Qg6Eaio125bTWl+$cv^=7aTJA3C?)8CsFYv=kU>Rg1`!}g?T5xe zIYH!5ax9MGp}m|46}w4)tc5@pwFzhSO=o2%FKaBEht&MsY@g2ZpH28j_((T8csfwjnQto&LIl zqAkj*#zLBK!e~>_XvXfau9N|WLjQ&;$|Bl85%AmZUxkfWy9Ve8FkqW5;=(l*TcI@0 zuLA)=JqBTGCX3-DM9@e=jr2!Za!b9eN-$+?oyUhlTu?QTpo$>Kdnv47mt~3bFg_RS za|S9MWjO1BQn%md@dX&x!LwzhY`~S_@=$D3fQm9)={L73E7xiTMZ=MKpv#AWRHZ|O zoWC+BXZPaIs<*(EvU}mPa%pUawhH@4p)*Igd#vSR+v3e);{z3UyN=sB_2Slb{7ZC( z_r?N&%ai3jqg7Ym5ywV%Ui(ybI_*9&(lRz%@nE+8`E22l#~aMMZ2!la^W*#a#eV#1e`A7AD^8ozk3riRby?~3N$UTbr0B>TsgtZoz~u;lfZAMX3lUwrQ@a<01B zlUH5yZDiS|j}xs^J@@Jg&lJ>6MOLm|b3FHCNhg0{bY^hPa$;!_aoF74(cSg_8ID8* L1GW5sud(YVE;X`1 diff --git a/src/main/resources/assets/forestry/textures/blocks/ores/copper_overlay.png b/src/main/resources/assets/forestry/textures/blocks/ores/copper_overlay.png deleted file mode 100644 index 287f34796e76584572140409f750f37fdfd17e48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1199 zcma)5U2oG?7`9d+4OrCz6B66ak=vp25j##3JMrqVBu;5W-K9wex!Q2;)5dD;prQKulaLrF;lM!^+2iQmw$cQ3h1|MAg=6z1em%X&1ZQPw0-@rtD&wc4Yf}=y{&^ zIq&=WRHo-(lws)0801zb?NMGcvZ>SGwsvRo19Kxid2M7+i|O=%H$aCc5&;up6?o>5<%*s}uj-0q?H{u=ScTw0iC!~R zP%9|3rBdK+YdrPF2n}O!w0yq7~#c`0M-XhqB(lMn3X%%W09Ri z7csU)mMxV^OsSng&H&5BVliJM6bcYTz%5%?^#YdLQd5wjt2u^^4P*gdQSC#+SfYv3 zwJVtRhOFhTr->wt^;DbXn4o{98cfhWV6sk!;VG@*WcoY zvc;qWRg9cGLPNDIW{LT>;7Fl`c9hK}(*)H@wy zg4HXFMtv{gx_awey}p-7T`o(^uzq3xQRvzc=^lT%(Y9o>(fH6J-R_XK=Benb z>CUIV80)z3L2i0Xn0-=OcwD}BA~1da;POIw@muuuId=XtV}7c1sUlCE=H@HC6Q`rq zqJTty~c}`fk75i?2d2sRdhgbB6XIg)_?=8;4x$EsS)#B|FdwzYCt{xX2O=c!1 z_}gdIYZYnn)3-jk_0I2K_RdY4U)|(Bzay@!tXzJ9-Al~u!`Yr3+5XQ#wLH7AL}>4( z<#^uvt#2vO@KRyZFUQWmoji0%*;Gx8?wH;g=-mdYplQd^=8r3XEdQMS^ZRP5a&GfC z&EuVsF{S%3#ekb9`?ofY{rK9Mp|%fOXFuBBBENZdSL@ZEMi;MjQQ#?cLEk+x-}rKb Ogrd@^9{FzK=;+@{Yppf_ diff --git a/src/main/resources/assets/forestry/textures/blocks/ores/tin_overlay.png b/src/main/resources/assets/forestry/textures/blocks/ores/tin_overlay.png deleted file mode 100644 index 5f1ce5e2a71d8e220a834e2f1ec0409fbb334ef0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1194 zcma)5Z)g)|96ndNNwGK(CL0W1PbTd!x!g5LlcUi#xpW3i7m|SaAZ3@kx9wT)-t+FQ zNh^pr84f>*3S;{)7$c}3MDW8tOt5SU>N*`d+NS?()5O@O|6A~5eXlmv56kf7?%qE< z&+~iU-|u(dN7}xst@*5mqNv)?At6fUkF9rm75UcLcE-r`DGnxZ40Yg?Xh5n(Mo9=l zs@MsmP?UR5K7>saRYfcD1WtsH@Dft(qJ^=iRh_UYs_9@_7o~29K@xTUzG*1Lnh((ZAPiQ8e_R$-$NmE&PEV6vsc4n+NPO%%L)QCB}37%f;3<$ zib>RieKc|U<_fC5C99d6X(9<@(xT3=c87JPGB6zef2gW%p-mixZ~gwKuo>^wArplr z>M>4C}q}f;KN})q?uUMBp4EW zG*PfCip;Zq!NYm{&K5@_%d$bI$LZuejjX4|9dxw@8y#h?fTSK3YPigm-*R0QxmGKv zI*BYmLpcTIRs*SE(1%Mde+RoHh5T|Oe+V=cGZmTa~fA8MrA z4bs+EcP&(tU*b&UNIdu=H#RXgm>qpKo_#hyJC&apT%4PJIh!lyM~6qAzFM9sBmp*|21&$Wo~3`Wv*15T3wl6Sjgq4hL;x#rNa1Zer#@La(pa%@4=nHrvncL`q!57 z&!>l;j|>%yg{kqO)#cJ+sqkv8R4R_Xm>m9hcwn|TvA(|kL*HbGIQbGs+hSzp zZ{65`Vb9}p$Ln@~^c#1qIbQwuC$)7yUH&{9Y2DXe@9nv8)|t5S^@l$nzC<;j-A2`9 WzBrxv?#iDe5)}%z2{--UoO=z^BGh^S