Compare commits

..
11 Commits
Author SHA1 Message Date
Dream-Master 0c3604467e bump version 2020-02-03 23:15:07 +01:00
Martin Robertz 921ab91124 Merge pull request #6 from Zoko061602/master
Added Grinding Balls and End Steel
2020-02-03 23:13:09 +01:00
Zoko061602 3ae96b3f35 Added Grinding Balls and End Steel 2020-02-03 22:38:49 +01:00
Martin Robertz d05257522e Merge pull request #5 from GTNewHorizons/revert-4-patch-3
Revert "Allow Galacticraft handles SoulBound itself"
2018-01-25 09:03:12 +01:00
Martin Robertz 3af0cb5421 Revert "Allow Galacticraft handles SoulBound itself" 2018-01-25 09:03:01 +01:00
Martin Robertz ca6f5954f3 Merge pull request #4 from Ugachaga/patch-3
Allow Galacticraft handles SoulBound itself
2018-01-25 07:17:32 +01:00
Ugachaga a5a61f9fe5 Allow Galacticraft handles SoulBound itself 2018-01-25 13:07:41 +07:00
Dream-Master 037e9a47ec bump version 2017-03-06 21:40:27 +01:00
Martin Robertz b646a594c4 Merge pull request #3 from Ugachaga/patch-2
Allow Baubles handle SoulBound itself
2017-03-06 21:36:20 +01:00
Ugachaga d5f78ad1f3 Allow Baubles handle SoulBound itself 2017-03-07 03:18:41 +07:00
Ugachaga 246633ca7b Fixed Googles chat message 2017-03-04 08:45:33 +07:00
29 changed files with 267 additions and 12 deletions

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@ minecraft_version=1.7.10
forge_version=10.13.4.1448-1.7.10
forgeDep_version=10.13.4.1448
mod_version=2.3.0.431_beta
mod_version=2.3.0.433_beta
#Comment out this line to get rid of the appendix
#mod_appendix=beta
@@ -136,6 +136,16 @@
<output>
<itemStack modID="EnderIO" itemName="itemAlloy" itemMeta="7" exp="0.7" />
</output>
</recipe>
<recipe name="End Steel" energyCost="20000">
<input>
<itemStack modID="minecraft" itemName="end_stone" />
<itemStack modID="EnderIO" itemName="itemAlloy" itemMeta="6" />
<itemStack modID="minecraft" itemName="obsidian" />
</input>
<output>
<itemStack modID="EnderIO" itemName="itemAlloy" itemMeta="8" exp="0.7" />
</output>
</recipe>
<recipe name="Fused Quartz" energyCost="5000" >
<input>
@@ -2959,12 +2959,46 @@
</recipeGroup>
<grindingBalls>
<grindingBall id="Flint" grindingMultiplier="1.2" chanceMultiplier="1.25" powerMultiplier="0.85" durationRF="24000" >
<itemStack oreDictionary="itemFlint" />
</grindingBall>
<grindingBall id="DarkSteelBall" grindingMultiplier="1.5" chanceMultiplier="2" powerMultiplier="0.7" durationRF="100000" >
<itemStack oreDictionary="itemDarkGrindingBall" />
</grindingBall>
<grindingBall id="ElectricalSteelBall" grindingMultiplier="1.2" chanceMultiplier="1.65" powerMultiplier="0.8" durationRF="40000" >
<itemStack oreDictionary="itemElectricalGrindingBall" />
</grindingBall>
<grindingBall id="EnergeticAlloyBall" grindingMultiplier="1.6" chanceMultiplier="1.1" powerMultiplier="1.1" durationRF="80000" >
<itemStack oreDictionary="itemEnergeticGrindingBall" />
</grindingBall>
<grindingBall id="VibrantAlloyBall" grindingMultiplier="1.75" chanceMultiplier="1.35" powerMultiplier="1.35" durationRF="80000" >
<itemStack oreDictionary="itemVibrantGrindingBall" />
</grindingBall>
<grindingBall id="RedstoneAlloyBall" grindingMultiplier="1.00" chanceMultiplier="1.00" powerMultiplier="0.35" durationRF="30000" >
<itemStack oreDictionary="itemRedstoneGrindingBall" />
</grindingBall>
<grindingBall id="ConductiveIronBall" grindingMultiplier="1.35" chanceMultiplier="1.00" powerMultiplier="1.0" durationRF="40000" >
<itemStack oreDictionary="itemConductiveGrindingBall" />
</grindingBall>
<grindingBall id="PulsatingIronBall" grindingMultiplier="1.0" chanceMultiplier="1.85" powerMultiplier="1.0" durationRF="100000" >
<itemStack oreDictionary="itemPulsatingGrindingBall" />
</grindingBall>
<grindingBall id="SoulariumBall" grindingMultiplier="1.2" chanceMultiplier="2.15" powerMultiplier="0.9" durationRF="80000" >
<itemStack oreDictionary="itemSoulariumGrindingBall" />
</grindingBall>
<grindingBall id="EndSteelBall" grindingMultiplier="1.4" chanceMultiplier="2.4" powerMultiplier="0.7" durationRF="75000" >
<itemStack oreDictionary="itemEndSteelGrindingBall" />
</grindingBall>
<excludes>
<itemStack modID="minecraft" itemName="glowstone" />
+14
View File
@@ -190,12 +190,22 @@ enderio.gas.gasTick=Gas/t
enderio.itemMachinePart.name=Machine Parts
enderio.machineChassi.name=Machine Chassis
enderio.basicGear.name=Basic Gear
enderio.soulMachineChassi.name=Soul Machine Chassis
enderio.endSteelMachineChassi.name=End Steel Chassis
enderio.pulsatingCrystal.name=Pulsating Crystal
enderio.vibrantCrystal.name=Vibrant Crystal
enderio.enderCrystal.name=Ender Crystal
enderio.attractorCrystal.name=Enticing Crystal
enderio.weatherCrystal.name=Weather Crystal
enderio.darkGrindingBall.name=Dark Steel Ball
enderio.electricalGrindingBall.name=Electrical Steel Ball
enderio.energeticGrindingBall.name=Energetic Alloy Ball
enderio.vibrantGrindingBall.name=Vibrant Alloy Ball
enderio.redstoneGrindingBall.name=Redstone Alloy Ball
enderio.conductiveGrindingBall.name=Conductive Iron Ball
enderio.pulsatingGrindingBall.name=Pulsating Iron Ball
enderio.soulariumGrindingBall.name=Soularium Ball
enderio.endSteelGrindingBall.name=End Steel Ball
enderio.darkGrindingBall.tooltip.detailed.line1=SAG Mill Grinding Ball
enderio.darkGrindingBall.tooltip.detailed.line2=Main Output
enderio.darkGrindingBall.tooltip.detailed.line3=Bonus Output
@@ -227,6 +237,9 @@ enderio.phasedIron.name=Pulsating Iron
enderio.vibrantNugget.name=Vibrant Alloy Nugget
enderio.darkSteel.name=Dark Steel
enderio.soularium.name=Soularium
enderio.endSteel.name=End Steel
enderio.endSteelNugget.name=End Steel Nugget
tile.blockIngotStorage.name=Ingot Storage
tile.enderio.electricalSteel.name=Electrical Steel Block
@@ -238,6 +251,7 @@ tile.enderio.phasedIron.name=Pulsating Iron Block
tile.enderio.vibrantNugget.name=Vibrant Nugget Block
tile.enderio.darkSteel.name=Dark Steel Block
tile.enderio.soularium.name=Soularium Block
tile.enderio.endSteel.name=End Steel Block
//Powder / Ingot
enderio.powderCoal.name=Coal Powder
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

@@ -0,0 +1,33 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
1,
2,
3,
4,
5,
5,
4,
3,
2,
1,
]
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 687 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

@@ -0,0 +1,27 @@
{
"animation": {
"frametime": 1,
"frames": [
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
1,
2,
3,
4
]
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

@@ -0,0 +1,33 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
1,
2,
3,
4,
5,
5,
4,
3,
2,
1,
]
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

@@ -0,0 +1,33 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
1,
2,
3,
4,
5,
5,
4,
3,
2,
1,
]
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 596 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

@@ -0,0 +1,33 @@
{
"animation": {
"frametime": 2,
"frames": [
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
0,
1,
2,
3,
4,
5,
5,
4,
3,
2,
1,
]
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 655 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 705 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 656 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 650 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 643 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 681 B

@@ -89,7 +89,7 @@ public class EnchantmentSoulBound extends Enchantment implements IAdvancedEnchan
// wait for that because gravestone mods also listen to this event. So we have
// to fetch Baubles items ourselves here.
// For the same reason we cannot put the items into Baubles slots.
IInventory baubles = BaublesUtil.instance().getBaubles(evt.entityPlayer);
/*IInventory baubles = BaublesUtil.instance().getBaubles(evt.entityPlayer);
if (baubles != null) {
for (int i = 0; i < baubles.getSizeInventory(); i++) {
ItemStack item = baubles.getStackInSlot(i);
@@ -99,7 +99,7 @@ public class EnchantmentSoulBound extends Enchantment implements IAdvancedEnchan
}
}
}
}
}*/
// Galacticraft. Again we are too early for those items. We just dump the
// stuff into the normal inventory to not have to keep a separate list.
@@ -165,7 +165,7 @@ public class KeyTracker {
}
if(gogglesKey.isPressed()) {
boolean isActive = !DarkSteelItems.itemDarkSteelHelmet.isGogglesUgradeActive();
sendEnabledChatMessage("darksteel.upgrade.goggles", isActive);
sendEnabledChatMessage("darksteel.upgrade.gogglesOfRevealing", isActive);
DarkSteelItems.itemDarkSteelHelmet.setGogglesUgradeActive(isActive);
}
}
@@ -18,7 +18,9 @@ public enum Alloy {
CONDUCTIVE_IRON("conductiveIron", 5.2f),
PHASED_IRON("phasedIron", 7.0f, "pulsatingIron"),
DARK_STEEL("darkSteel", 10.0f),
SOULARIUM("soularium", 10.0f);
SOULARIUM("soularium", 10.0f),
END_STEEL("endSteel", 10.0f);
public final String unlocalisedName;
public final String iconKey;
@@ -9,7 +9,10 @@ import org.apache.commons.lang3.StringUtils;
public enum MachinePart {
MACHINE_CHASSI("machineChassi"),
BASIC_GEAR("basicGear");
BASIC_GEAR("basicGear"),
SOUL_MACHINE_CHASSIS("soulMachineChassi"),
END_STEEL_MACHINE_CHASSIS("endSteelMachineChassi");
public final String unlocalisedName;
public final String iconKey;
@@ -20,7 +23,7 @@ public enum MachinePart {
this.iconKey = "enderio:" + unlocalisedName;
this.oreDict = "item" + StringUtils.capitalize(unlocalisedName);
}
public static void registerOres(Item item) {
for (MachinePart m : values()) {
OreDictionary.registerOre(m.oreDict, new ItemStack(item, 1, m.ordinal()));
@@ -24,7 +24,7 @@ public class MachinePartRenderer implements IItemRenderer {
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
if(item != null && item.getItemDamage() == MachinePart.MACHINE_CHASSI.ordinal()) {
if(item != null && item.getItemDamage() != MachinePart.BASIC_GEAR.ordinal()) {
return type == ItemRenderType.ENTITY || type == ItemRenderType.EQUIPPED || type == ItemRenderType.INVENTORY
|| type == ItemRenderType.EQUIPPED_FIRST_PERSON;
} else {
@@ -20,7 +20,17 @@ public enum Material {
DARK_GRINDING_BALL("darkGrindingBall"),
ENDER_CRYSTAL("enderCrystal", true),
ATTRACTOR_CRYSTAL("attractorCrystal", true),
WEATHER_CRYSTAL("weatherCrystal", true);
WEATHER_CRYSTAL("weatherCrystal", true),
END_STEEL_NUGGET("endSteelNugget"),
ELECTRICAL_GRINDING_BALL("electricalGrindingBall"),
ENERGETIC_GRINDING_BALL("energeticGrindingBall"),
VIBRANT_GRINDING_BALL("vibrantGrindingBall"),
REDSTONE_GRINDING_BALL("redstoneGrindingBall"),
CONDUCTIVE_GRINDING_BALL("conductiveGrindingBall"),
PULSATING_GRINDING_BALL("pulsatingGrindingBall"),
SOULARIUM_GRINDING_BALL("soulariumGrindingBall"),
END_STEEL_GRINDING_BALL("endSteelGrindingBall");
public final String unlocalisedName;
public final String iconKey;
@@ -47,7 +57,7 @@ public enum Material {
public ItemStack getStack() {
return getStack(1);
}
public ItemStack getStack(int size) {
return new ItemStack(EnderIO.itemMaterial, size, ordinal());
}
@@ -41,7 +41,7 @@ public class MaterialRecipes {
OreDictionary.registerOre(powder.oreDictName, new ItemStack(EnderIO.itemPowderIngot, 1, powder.ordinal()));
}
}
for (Alloy alloy : Alloy.values()) {
boolean isPrimaryName = true;
for (String oreDictName : alloy.getOreIngots()) {
@@ -141,6 +141,22 @@ public class MaterialRecipes {
//Balls
ItemStack darkBall = new ItemStack(EnderIO.itemMaterial, 5, Material.DARK_GRINDING_BALL.ordinal());
addShaped(darkBall, " s ", "sss", " s ", 's', darkSteel);
ItemStack electricalBall = new ItemStack(EnderIO.itemMaterial, 5, Material.ELECTRICAL_GRINDING_BALL.ordinal());
addShaped(electricalBall, " s ", "sss", " s ", 's', ELECTRICAL_STEEL.getStackIngot());
ItemStack energeticBall = new ItemStack(EnderIO.itemMaterial, 5, Material.ENERGETIC_GRINDING_BALL.ordinal());
addShaped(energeticBall, " s ", "sss", " s ", 's', ENERGETIC_ALLOY.getStackIngot());
ItemStack vibrantBall = new ItemStack(EnderIO.itemMaterial, 5, Material.VIBRANT_GRINDING_BALL.ordinal());
addShaped(vibrantBall, " s ", "sss", " s ", 's', PHASED_GOLD.getStackIngot());
ItemStack redstoneBall = new ItemStack(EnderIO.itemMaterial, 5, Material.REDSTONE_GRINDING_BALL.ordinal());
addShaped(redstoneBall, " s ", "sss", " s ", 's', REDSTONE_ALLOY.getStackIngot());
ItemStack conductiveBall = new ItemStack(EnderIO.itemMaterial, 5, Material.CONDUCTIVE_GRINDING_BALL.ordinal());
addShaped(conductiveBall, " s ", "sss", " s ", 's', CONDUCTIVE_IRON.getStackIngot());
ItemStack pulsatingBall = new ItemStack(EnderIO.itemMaterial, 5, Material.PULSATING_GRINDING_BALL.ordinal());
addShaped(pulsatingBall, " s ", "sss", " s ", 's', PHASED_IRON.getStackIngot());
ItemStack soulariumBall = new ItemStack(EnderIO.itemMaterial, 5, Material.SOULARIUM_GRINDING_BALL.ordinal());
addShaped(soulariumBall, " s ", "sss", " s ", 's', SOULARIUM.getStackIngot());
ItemStack endBall = new ItemStack(EnderIO.itemMaterial, 5, Material.END_STEEL_GRINDING_BALL.ordinal());
addShaped(endBall, " s ", "sss", " s ", 's', END_STEEL.getStackIngot());
//Smelting
ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal());
@@ -171,6 +187,13 @@ public class MaterialRecipes {
String mat = Config.useSteelInChassi == true && steelIngots != null && !steelIngots.isEmpty() ? "ingotSteel" : "ingotIron";
addShaped(chassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', mat, 'c', capacitor);
ItemStack soulchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.SOUL_MACHINE_CHASSIS.ordinal());
addShaped(soulchassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', Alloy.SOULARIUM.getOreIngot(), 'c', capacitor);
ItemStack endchassis = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.END_STEEL_MACHINE_CHASSIS.ordinal());
addShaped(endchassis, "fif", "ici", "fif", 'f', Blocks.iron_bars, 'i', Alloy.END_STEEL.getOreIngot(), 'c', capacitor);
// Basic Gear
ItemStack gear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal());
addShaped(gear, "scs", "c c", "scs", 's', "stickWood", 'c', "cobblestone");
@@ -212,7 +235,7 @@ public class MaterialRecipes {
ItemStack bread = new ItemStack(Items.bread, 1, 0);
GameRegistry.addSmelting(flour, bread, 0.35f);
ItemStack enderios = EnderFood.ENDERIOS.getStack();
addShapeless(enderios, Items.bowl, Items.milk_bucket, "cropWheat", "dustEnderPearl");