Skip to content

Commit fa1bab2

Browse files
WanionCaneWanionCane
committed
1.3
1 parent 2e078b3 commit fa1bab2

File tree

11 files changed

+33
-26
lines changed

11 files changed

+33
-26
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Avaritiaddons
2-
A Mod that tries to expand the Infinity!
2+
A Mod that tries to expand the meaning of Infinity!

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ buildscript {
1717

1818
apply plugin: 'forge'
1919

20-
version = "1.2d"
20+
version = "1.3"
2121
group= "wanion.avaritiaddons" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
2222
archivesBaseName = "Avaritiaddons"
2323

‎src/main/java/wanion/avaritiaddons/CommonProxy.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import cpw.mods.fml.common.FMLCommonHandler;
1212
import cpw.mods.fml.common.network.NetworkRegistry;
1313
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
14-
import cpw.mods.fml.common.registry.GameData;
1514
import cpw.mods.fml.common.registry.GameRegistry;
1615
import cpw.mods.fml.relauncher.Side;
1716
import fox.spiteful.avaritia.blocks.LudicrousBlocks;
@@ -45,6 +44,7 @@
4544
import java.util.List;
4645

4746
import static wanion.avaritiaddons.Avaritiaddons.networkWrapper;
47+
import static fox.spiteful.avaritia.Config.craftingOnly;
4848

4949
public class CommonProxy
5050
{
@@ -81,16 +81,19 @@ public final void init()
8181
ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(new ItemStack(BlockCompressedChest.instance), "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC", "CCCCCCCCC", 'C', Blocks.chest);
8282
else
8383
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BlockCompressedChest.instance), "CCC", "CCC", "CCC", 'C', Blocks.chest));
84+
if (craftingOnly)
85+
return;
8486
if (Config.hardInfinityChestRecipe)
8587
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BlockInfinityChest.instance), "INI", "BCB", "IBI", 'I', "ingotInfinity", 'N', "blockCosmicNeutronium", 'B', "blockInfinity", 'C', BlockCompressedChest.instance));
8688
else
8789
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BlockInfinityChest.instance), "TNT", "ICI", "TIT", 'T', new ItemStack(LudicrousItems.resource, 1, 5), 'N', "blockCosmicNeutronium", 'I', "ingotInfinity", 'C', BlockCompressedChest.instance));
88-
//if (Config.hardExtremeAutoCrafterRecipe)
8990
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BlockExtremeAutoCrafter.instance), " S ", "NCN", " N ", 'S', new ItemStack(LudicrousItems.singularity, 1, 3), 'N', "blockCosmicNeutronium", 'C', new ItemStack(LudicrousBlocks.dire_crafting)));
9091
}
9192

9293
public final void postInit()
9394
{
95+
if (craftingOnly)
96+
return;
9497
populateRemovalSets();
9598
for (final Iterator<Object> catalystRecipeIterator = Grinder.catalyst.getInput().iterator(); catalystRecipeIterator.hasNext(); )
9699
{

‎src/main/java/wanion/avaritiaddons/block/chest/compressed/ItemRendererCompressedChest.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRe
3434
@Override
3535
public void renderItem(ItemRenderType type, ItemStack item, Object... data)
3636
{
37-
RendererAvaritiaddonsChest.instance.renderTileEntityAt(tileEntityCompressedChest, 0, 0, 0, 0);
37+
if (type == ItemRenderType.ENTITY)
38+
RendererAvaritiaddonsChest.instance.renderTileEntityAt(tileEntityCompressedChest, -0.5F, -0.5F, -0.5F, 0);
39+
else
40+
RendererAvaritiaddonsChest.instance.renderTileEntityAt(tileEntityCompressedChest, 0, 0, 0, 0);
3841
}
3942
}

‎src/main/java/wanion/avaritiaddons/block/chest/infinity/ItemRendererInfinityChest.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRe
3434
@Override
3535
public void renderItem(ItemRenderType type, ItemStack item, Object... data)
3636
{
37-
RendererAvaritiaddonsChest.instance.renderTileEntityAt(tileEntityInfinityChest, 0, 0, 0, 0);
37+
if (type == ItemRenderType.ENTITY)
38+
RendererAvaritiaddonsChest.instance.renderTileEntityAt(tileEntityInfinityChest, -0.5F, -0.5F, -0.5F, 0);
39+
else
40+
RendererAvaritiaddonsChest.instance.renderTileEntityAt(tileEntityInfinityChest, 0, 0, 0, 0);
3841
}
3942
}

‎src/main/java/wanion/avaritiaddons/block/extremeautocrafter/TileEntityExtremeAutoCrafter.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
public class TileEntityExtremeAutoCrafter extends TileEntity implements ISidedInventory
3131
{
3232
private final ItemStack[] itemStacks = new ItemStack[163];
33+
private int outputStackSize = 0;
3334
private final InventoryCrafting craftingMatrix = new ExtremeCraftingMatrix();
3435
private static final int[] slotsForAllSides = new int[82];
3536
private boolean recipeChanged = true;
@@ -64,6 +65,7 @@ public void updateEntity()
6465
patternMap = null;
6566
markDirty();
6667
} else if (output != null) {
68+
outputStackSize = output.stackSize;
6769
output.stackSize = 0;
6870
itemStacks[162] = output;
6971
patternMap = MetaItem.getKeySizeMap(81, 162, itemStacks);
@@ -76,16 +78,17 @@ public void updateEntity()
7678
patternMap = null;
7779
return;
7880
}
81+
outputStackSize = output.stackSize;
7982
output.stackSize = 0;
8083
itemStacks[162] = output;
8184
}
8285
if (patternMap == null)
8386
return;
8487
final ItemStack outputStack = itemStacks[162];
85-
if (outputStack == null || outputStack.stackSize == outputStack.getMaxStackSize() || !matches(MetaItem.getSmartKeySizeMap(0, 81, itemStacks), patternMap))
88+
if (outputStack == null || outputStack.stackSize + outputStackSize > outputStack.getMaxStackSize() || !matches(MetaItem.getSmartKeySizeMap(0, 81, itemStacks), patternMap))
8689
return;
8790
cleanInput();
88-
outputStack.stackSize++;
91+
outputStack.stackSize += outputStackSize;
8992
markDirty();
9093
}
9194

‎src/main/java/wanion/avaritiaddons/client/ClientProxy.java

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
*/
1010

1111
import cpw.mods.fml.client.registry.ClientRegistry;
12-
import cpw.mods.fml.common.FMLCommonHandler;
1312
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
1413
import cpw.mods.fml.relauncher.Side;
1514
import cpw.mods.fml.relauncher.SideOnly;

‎src/main/java/wanion/avaritiaddons/client/RenderItemInfinity.java

+9-14
Original file line numberDiff line numberDiff line change
@@ -73,21 +73,16 @@ private void renderQuad(Tessellator p_77017_1_, int p_77017_2_, int p_77017_3_,
7373
p_77017_1_.draw();
7474
}
7575

76-
private String humanReadableValue(int value)
76+
private static String humanReadableValue(final int value)
7777
{
78-
if (value > 0 && value <= 99)
78+
if (value > 0 && value < 1000)
7979
return Integer.toString(value);
80-
else if (value >= 100 && value < 1000)
81-
return Integer.toString(value);
82-
else if (value >= 1000 && value < 1000000) {
83-
value /= 1000;
84-
return Integer.toString(value) + "K";
85-
} else if (value >= 1000000 && value <= 1000000000) {
86-
value /= 1000000;
87-
return Integer.toString(value) + "M";
88-
} else if (value >= 1000000000) {
89-
value /= 1000000000;
90-
return Integer.toString(value) + "B";
91-
} else return null;
80+
else if (value >= 1000 && value < 1000000)
81+
return Integer.toString(value / 1000) + "K";
82+
else if (value >= 1000000 && value <= 1000000000)
83+
return Integer.toString(value / 1000000) + "M";
84+
else if (value >= 1000000000)
85+
return Integer.toString(value / 1000000000) + "B";
86+
else return null;
9287
}
9388
}

‎src/main/java/wanion/avaritiaddons/common/Reference.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public final class Reference
1414
{
1515
public static final String MOD_ID = "avaritiaddons";
1616
public static final String MOD_NAME = "Avaritiaddons";
17-
public static final String MOD_VERSION = "1.2d";
17+
public static final String MOD_VERSION = "1.3";
1818
public static final String DEPENDENCIES = "required-after:Avaritia;required-after:wanionlib@[1.7.10-1.2,)";
1919
public static final String CLIENT_PROXY = "wanion.avaritiaddons.client.ClientProxy";
2020
public static final String SERVER_PROXY = "wanion.avaritiaddons.CommonProxy";

‎src/main/java/wanion/avaritiaddons/common/slot/SpecialSlot.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public void putStack(final ItemStack itemStack)
3636
public boolean canTakeStack(final EntityPlayer entityPlayer)
3737
{
3838
final ItemStack slotStack = getStack();
39-
return slotStack != null && slotStack.stackSize > 0 && (entityPlayer.inventory.getItemStack() == null || ItemStack.areItemStacksEqual(slotStack, entityPlayer.inventory.getItemStack()));
39+
final ItemStack playerStack = entityPlayer.inventory.getItemStack();
40+
return slotStack != null && slotStack.stackSize > 0 && (playerStack == null || (slotStack.getItem() == playerStack.getItem() && (!playerStack.getHasSubtypes() || playerStack.getItemDamage() == slotStack.getItemDamage()) && ItemStack.areItemStackTagsEqual(playerStack, slotStack)));
4041
}
4142
}

‎src/main/resources/mcmod.info

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"modid": "avaritiaddons",
44
"name": "Avaritiaddons",
55
"description": "A Mod that tries to expand the meaning of Infinity!",
6-
"version": "1.2d",
6+
"version": "1.3",
77
"mcversion": "${mcversion}",
88
"url": "http://minecraft.curseforge.com/projects/avaritiaddons",
99
"updateUrl": "",

0 commit comments

Comments
 (0)