Compare commits

..
5 Commits
13 changed files with 92 additions and 115 deletions

No files matched your search

+2 -2
View File
@@ -2,8 +2,8 @@
dependencies {
api('curse.maven:cofh-lib-220333:2388748')
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta18:api')
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.45-GTNH:dev')
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta6:api')
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.35-GTNH:dev')
compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.0:api')
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
+1 -1
View File
@@ -17,7 +17,7 @@ pluginManagement {
}
plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27'
}
-5
View File
@@ -15,7 +15,6 @@ import net.minecraft.item.Item;
import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.ModAPIManager;
@@ -80,15 +79,11 @@ public class Forestry {
public static PacketHandler packetHandler;
public static boolean isDreamcraftLoaded;
@EventHandler
public void preInit(FMLPreInitializationEvent event) {
checkForCoFHLib();
packetHandler = new PacketHandler();
isDreamcraftLoaded = Loader.isModLoaded("dreamcraft");
// Register event handler
EventHandlerCore eventHandlerCore = new EventHandlerCore();
MinecraftForge.EVENT_BUS.register(eventHandlerCore);
@@ -53,7 +53,7 @@ public interface IIndividual extends INBTTagable {
boolean isPureBred(IChromosomeType chromosomeType);
default void addLore(List<String> text) {}
void addLore(List<String> text);
default void addDiscoveredBy(List<String> text) {}
void addDiscoveredBy(List<String> text);
}
@@ -18,7 +18,6 @@ import java.util.Map;
import java.util.Random;
import java.util.Set;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
@@ -67,6 +66,7 @@ import forestry.core.errors.EnumErrorCode;
import forestry.core.genetics.Chromosome;
import forestry.core.genetics.GenericRatings;
import forestry.core.genetics.IndividualLiving;
import forestry.core.proxy.Proxies;
import forestry.core.utils.GeneticsUtil;
import forestry.core.utils.Log;
import forestry.core.utils.StringUtil;
@@ -385,8 +385,8 @@ public class Bee extends IndividualLiving implements IBee {
if (descTokens.length > 0) {
String speciesLore = descTokens[0];
if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) {
FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
if (!speciesLore.isEmpty() && !speciesLore.contains("for.description") && Proxies.common.isCtrlDown()) {
FontRenderer fontRenderer = Proxies.common.getClientInstance().fontRenderer;
String formattedLore = EnumChatFormatting.GOLD + speciesLore;
List<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
text.addAll(formattedLoreList);
@@ -13,7 +13,6 @@ import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
@@ -108,8 +107,11 @@ public class AlleleEffectRadioactive extends AlleleEffectThrottled {
}
// Some mods might use this logic? Idk, just a safety check. Might stop griefing.
EntityPlayer player = world.func_152378_a(housing.getOwner().getId());
if (player == null || !world.canMineBlock(player, posHousing.x, posHousing.y, posHousing.z)) {
if (!world.canMineBlock(
housing.getWorld().func_152378_a(housing.getOwner().getId()),
posHousing.x,
posHousing.y,
posHousing.z)) {
continue;
}
@@ -16,7 +16,6 @@ import java.util.List;
import javax.annotation.Nullable;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -52,6 +51,7 @@ import forestry.arboriculture.genetics.alleles.AlleleFruit;
import forestry.core.config.Config;
import forestry.core.genetics.Chromosome;
import forestry.core.genetics.Individual;
import forestry.core.proxy.Proxies;
import forestry.core.utils.StringUtil;
public class Tree extends Individual implements ITree, IPlantable {
@@ -307,8 +307,8 @@ public class Tree extends Individual implements ITree, IPlantable {
if (descTokens.length > 0) {
String speciesLore = descTokens[0];
if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) {
FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
if (!speciesLore.isEmpty() && !speciesLore.contains("for.description") && Proxies.common.isCtrlDown()) {
FontRenderer fontRenderer = Proxies.common.getClientInstance().fontRenderer;
String formattedLore = EnumChatFormatting.GOLD + speciesLore;
List<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
text.addAll(formattedLoreList);
@@ -8,6 +8,8 @@
******************************************************************************/
package forestry.core.genetics;
import java.util.List;
import net.minecraft.nbt.NBTTagCompound;
import forestry.api.genetics.IChromosomeType;
@@ -79,4 +81,10 @@ public abstract class Individual implements IIndividual {
return getGenome().getActiveAllele(chromosomeType).getUID()
.equals(getGenome().getInactiveAllele(chromosomeType).getUID());
}
@Override
public void addLore(List<String> text) {}
@Override
public void addDiscoveredBy(List<String> text) {}
}
@@ -8,8 +8,6 @@
******************************************************************************/
package forestry.core.items;
import static forestry.Forestry.isDreamcraftLoaded;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
@@ -89,26 +87,19 @@ public class ItemRegistryCore extends ItemRegistry {
fertilizerBio = registerItem(new ItemForestry(), "fertilizerBio");
fertilizerCompound = registerItem(new ItemForestryBonemeal(), "fertilizerCompound");
apatite = registerItem(new ItemForestry(), "apatite");
OreDictionary.registerOre("gemApatite", apatite);
researchNote = registerItem(new ItemResearchNote(), "researchNote");
if (!isDreamcraftLoaded) {
apatite = registerItem(new ItemForestry(), "apatite");
OreDictionary.registerOre("gemApatite", apatite);
ingotCopper = registerItem(new ItemForestry(), "ingotCopper");
OreDictionary.registerOre("ingotCopper", ingotCopper);
ingotCopper = registerItem(new ItemForestry(), "ingotCopper");
OreDictionary.registerOre("ingotCopper", ingotCopper);
ingotTin = registerItem(new ItemForestry(), "ingotTin");
OreDictionary.registerOre("ingotTin", ingotTin);
ingotTin = registerItem(new ItemForestry(), "ingotTin");
OreDictionary.registerOre("ingotTin", ingotTin);
ingotBronze = registerItem(new ItemForestry(), "ingotBronze");
OreDictionary.registerOre("ingotBronze", ingotBronze);
} else {
apatite = null;
ingotCopper = null;
ingotTin = null;
ingotBronze = null;
}
ingotBronze = registerItem(new ItemForestry(), "ingotBronze");
OreDictionary.registerOre("ingotBronze", ingotBronze);
wrench = registerItem(new ItemWrench(), "wrench");
pipette = registerItem(new ItemPipette(), "pipette");
@@ -14,7 +14,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Random;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.entity.EntityCreature;
import net.minecraft.item.ItemStack;
@@ -43,6 +42,7 @@ import forestry.api.lepidopterology.IEntityButterfly;
import forestry.core.genetics.Chromosome;
import forestry.core.genetics.GenericRatings;
import forestry.core.genetics.IndividualLiving;
import forestry.core.proxy.Proxies;
import forestry.core.utils.StringUtil;
public class Butterfly extends IndividualLiving implements IButterfly {
@@ -69,8 +69,8 @@ public class Butterfly extends IndividualLiving implements IButterfly {
if (descTokens.length > 0) {
String speciesLore = descTokens[0];
if (!speciesLore.isEmpty() && !speciesLore.contains("for.description")) {
FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer;
if (!speciesLore.isEmpty() && !speciesLore.contains("for.description") && Proxies.common.isCtrlDown()) {
FontRenderer fontRenderer = Proxies.common.getClientInstance().fontRenderer;
String formattedLore = EnumChatFormatting.GOLD + speciesLore;
List<String> formattedLoreList = fontRenderer.listFormattedStringToWidth(formattedLore, 200);
text.addAll(formattedLoreList);
+39 -50
View File
@@ -8,8 +8,6 @@
******************************************************************************/
package forestry.plugins;
import static forestry.Forestry.isDreamcraftLoaded;
import java.util.ArrayList;
import net.minecraft.command.ICommand;
@@ -134,16 +132,14 @@ public class PluginCore extends ForestryPlugin {
// forestry items
crateRegistry.registerCrate(items.peat, "cratedPeat");
crateRegistry.registerCrate(items.apatite, "cratedApatite");
crateRegistry.registerCrate(items.fertilizerCompound, "cratedFertilizer");
crateRegistry.registerCrate(items.mulch, "cratedMulch");
crateRegistry.registerCrate(items.phosphor, "cratedPhosphor");
crateRegistry.registerCrate(items.ash, "cratedAsh");
if (!isDreamcraftLoaded) {
crateRegistry.registerCrate(items.apatite, "cratedApatite");
crateRegistry.registerCrateUsingOreDict(items.ingotTin, "cratedTin");
crateRegistry.registerCrateUsingOreDict(items.ingotCopper, "cratedCopper");
crateRegistry.registerCrateUsingOreDict(items.ingotBronze, "cratedBronze");
}
crateRegistry.registerCrateUsingOreDict(items.ingotTin, "cratedTin");
crateRegistry.registerCrateUsingOreDict(items.ingotCopper, "cratedCopper");
crateRegistry.registerCrateUsingOreDict(items.ingotBronze, "cratedBronze");
// forestry blocks
crateRegistry.registerCrate(blocks.soil.get(BlockSoil.SoilType.HUMUS, 1), "cratedHumus");
@@ -199,14 +195,9 @@ public class PluginCore extends ForestryPlugin {
protected void registerRecipes() {
/* SMELTING RECIPES */
if (!isDreamcraftLoaded) {
RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.APATITE, 1), items.apatite, 0.5f);
RecipeUtil.addSmelting(
blocks.resources.get(BlockResourceOre.ResourceType.COPPER, 1),
items.ingotCopper,
0.5f);
RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.TIN, 1), items.ingotTin, 0.5f);
}
RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.APATITE, 1), items.apatite, 0.5f);
RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.COPPER, 1), items.ingotCopper, 0.5f);
RecipeUtil.addSmelting(blocks.resources.get(BlockResourceOre.ResourceType.TIN, 1), items.ingotTin, 0.5f);
RecipeUtil.addSmelting(new ItemStack(items.peat), items.ash, 0.0f);
/* BRONZE INGOTS */
@@ -391,43 +382,41 @@ public class PluginCore extends ForestryPlugin {
new ItemStack(Blocks.wool, 1, OreDictionary.WILDCARD_VALUE));
// Storage Blocks
if (!isDreamcraftLoaded) {
RecipeUtil.addRecipe(
blocks.resourceStorage.get(BlockResourceStorage.ResourceType.APATITE),
"###",
"###",
"###",
'#',
"gemApatite");
RecipeUtil.addShapelessRecipe(new ItemStack(items.apatite, 9), "blockApatite");
RecipeUtil.addRecipe(
blocks.resourceStorage.get(BlockResourceStorage.ResourceType.APATITE),
"###",
"###",
"###",
'#',
"gemApatite");
RecipeUtil.addShapelessRecipe(new ItemStack(items.apatite, 9), "blockApatite");
RecipeUtil.addRecipe(
blocks.resourceStorage.get(BlockResourceStorage.ResourceType.COPPER),
"###",
"###",
"###",
'#',
"ingotCopper");
RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotCopper, 9), "blockCopper");
RecipeUtil.addRecipe(
blocks.resourceStorage.get(BlockResourceStorage.ResourceType.COPPER),
"###",
"###",
"###",
'#',
"ingotCopper");
RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotCopper, 9), "blockCopper");
RecipeUtil.addRecipe(
blocks.resourceStorage.get(BlockResourceStorage.ResourceType.TIN),
"###",
"###",
"###",
'#',
"ingotTin");
RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotTin, 9), "blockTin");
RecipeUtil.addRecipe(
blocks.resourceStorage.get(BlockResourceStorage.ResourceType.TIN),
"###",
"###",
"###",
'#',
"ingotTin");
RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotTin, 9), "blockTin");
RecipeUtil.addRecipe(
blocks.resourceStorage.get(BlockResourceStorage.ResourceType.BRONZE),
"###",
"###",
"###",
'#',
"ingotBronze");
RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotBronze, 9), "blockBronze");
}
RecipeUtil.addRecipe(
blocks.resourceStorage.get(BlockResourceStorage.ResourceType.BRONZE),
"###",
"###",
"###",
'#',
"ingotBronze");
RecipeUtil.addShapelessRecipe(new ItemStack(items.ingotBronze, 9), "blockBronze");
}
@Override
@@ -8,8 +8,6 @@
******************************************************************************/
package forestry.plugins;
import static forestry.Forestry.isDreamcraftLoaded;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
@@ -646,20 +644,18 @@ public class PluginFactory extends ForestryPlugin {
new Object[] { " # ", " X ", " X ", '#', "ingotBronze", 'X', "stickWood" });
// Reclamation
if (!isDreamcraftLoaded) {
RecipeManagers.carpenterManager.addRecipe(
null,
PluginCore.items.ingotBronze.getItemStack(2),
"#",
'#',
PluginCore.items.brokenBronzePickaxe);
RecipeManagers.carpenterManager.addRecipe(
null,
PluginCore.items.ingotBronze.getItemStack(),
"#",
'#',
PluginCore.items.brokenBronzeShovel);
}
RecipeManagers.carpenterManager.addRecipe(
null,
PluginCore.items.ingotBronze.getItemStack(2),
"#",
'#',
PluginCore.items.brokenBronzePickaxe);
RecipeManagers.carpenterManager.addRecipe(
null,
PluginCore.items.ingotBronze.getItemStack(),
"#",
'#',
PluginCore.items.brokenBronzeShovel);
// Crating and uncrating
if (PluginManager.Module.STORAGE.isEnabled()) {
@@ -8,8 +8,6 @@
******************************************************************************/
package forestry.plugins;
import static forestry.Forestry.isDreamcraftLoaded;
import java.util.ArrayList;
import java.util.List;
@@ -132,13 +130,11 @@ public class PluginFluids extends ForestryPlugin {
}
if (RecipeManagers.squeezerManager != null) {
if (!isDreamcraftLoaded) {
RecipeManagers.squeezerManager.addContainerRecipe(
10,
items.canEmpty.getItemStack(),
PluginCore.items.ingotTin.getItemStack(),
0.05f);
}
RecipeManagers.squeezerManager.addContainerRecipe(
10,
items.canEmpty.getItemStack(),
PluginCore.items.ingotTin.getItemStack(),
0.05f);
RecipeManagers.squeezerManager.addContainerRecipe(
10,
items.waxCapsuleEmpty.getItemStack(),