mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-13 16:54:08 +00:00
More bugfixes
Fixed some derps on my side. Also added a configoption to set thaumcraft sapling droprate
This commit is contained in:
1 parent
0c5f27e192
commit
250e5c159f
7 files changed
+24
-15
No files matched your search
@@ -76,7 +76,10 @@ public class ItemThaumiumGrafter extends Item implements IRepairableExtended, IT
|
||||
int meta = world.getBlockMetadata(x, y, z) & 1;
|
||||
if (meta == 0 || meta == 1)
|
||||
{
|
||||
this.dropItem(world, x, y, z, new ItemStack(Config.tcPlant, 1, meta));
|
||||
double chance = Math.random();
|
||||
if (chance <= Config.ThaumcraftSaplingDroprate) {
|
||||
this.dropItem(world, x, y, z, new ItemStack(Config.tcPlant, 1, meta));
|
||||
}
|
||||
}
|
||||
}
|
||||
itemstack.damageItem(damage, entityLiving);
|
||||
|
||||
@@ -93,6 +93,6 @@ public class ItemThaumiumScoop extends Item implements IRepairable, IToolScoop
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IIconRegister iconRegister)
|
||||
{
|
||||
this.itemIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + "thaumiumScoop");
|
||||
this.itemIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":thaumiumScoop");
|
||||
}
|
||||
}
|
||||
@@ -50,7 +50,7 @@ public class Config
|
||||
{
|
||||
public boolean DrawParticleEffects;
|
||||
public boolean BeeInfusionsAdded;
|
||||
public boolean ThaumaturgeBackpackActive;
|
||||
public static boolean ThaumaturgeBackpackActive;
|
||||
public boolean AddThaumcraftItemsToBackpacks;
|
||||
public boolean DisableUpdateNotification;
|
||||
public boolean AreMagicPlanksFlammable;
|
||||
@@ -62,6 +62,7 @@ public class Config
|
||||
public boolean DoHiveRetrogen;
|
||||
public boolean ForceHiveRegen;
|
||||
public static boolean LogHiveSpawns;
|
||||
public static double ThaumcraftSaplingDroprate;
|
||||
|
||||
public static boolean ArsMagicaActive;
|
||||
public static boolean BloodMagicActive;
|
||||
@@ -462,6 +463,9 @@ public class Config
|
||||
p = configuration.get("general", "useImpregnatedStickInTools", false);
|
||||
p.comment = "Set to true to make Thaumium Grafter & Scoop require impregnated sticks in the recipe.";
|
||||
this.UseImpregnatedStickInTools = p.getBoolean(false);
|
||||
|
||||
p = configuration.get("general", "thaumCraftSaplingDroprate", 0.1, "The chance for thaumcraft saplings using the thaumium grafter", 0.0, 1.0);
|
||||
this.ThaumcraftSaplingDroprate = p.getDouble(0.1);
|
||||
|
||||
p = configuration.get("general", "moonDialShowText", false);
|
||||
p.comment = "set to true to show the current moon phase in mouse-over text.";
|
||||
|
||||
@@ -383,14 +383,16 @@ public class CraftingManager
|
||||
input, input, input, input
|
||||
});
|
||||
|
||||
// T1 Thaumaturge's backpack
|
||||
GameRegistry.addRecipe(new ItemStack(Config.thaumaturgeBackpackT1), new Object[] {
|
||||
"SWS", "NCN", "SWS",
|
||||
'S', Items.string,
|
||||
'W', Blocks.wool,
|
||||
'N', new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.AMBER.ordinal()),
|
||||
'C', Blocks.chest
|
||||
});
|
||||
if(Config.ThaumaturgeBackpackActive) {
|
||||
// T1 Thaumaturge's backpack
|
||||
GameRegistry.addRecipe(new ItemStack(Config.thaumaturgeBackpackT1), new Object[]{
|
||||
"SWS", "NCN", "SWS",
|
||||
'S', Items.string,
|
||||
'W', Blocks.wool,
|
||||
'N', new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.AMBER.ordinal()),
|
||||
'C', Blocks.chest
|
||||
});
|
||||
}
|
||||
|
||||
// "bottling" Crystal aspects.
|
||||
/*for (EnumTag tag : EnumTag.values())
|
||||
|
||||
@@ -25,7 +25,7 @@ public class VersionInfo
|
||||
|
||||
public static final String Logo = "/gfx/magicbees/logo.png";
|
||||
|
||||
public static final String Depends = "required-after:Forestry;after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:AWWayofTime";
|
||||
public static final String Depends = "required-after:Forestry@[3.1.1.4,);after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalFoundation;after:ThermalExpansion;after:AWWayofTime";
|
||||
|
||||
boolean criticalUpdate;
|
||||
boolean newVersion;
|
||||
|
||||
@@ -35,7 +35,7 @@ public class BackpackDefinition implements IBackpackDefinition
|
||||
|
||||
@Override
|
||||
public String getName(ItemStack backpack) {
|
||||
return backpack.getDisplayName();
|
||||
return name;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user