Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cardboard Backpack #321

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Cardboard Backpack #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9021d0
Added ESOF-docs
VascoUP Oct 10, 2016
3404732
First branch commit
VascoUP Dec 5, 2016
2f0f565
Added crafting recipe and fixed a few bugs
VascoUP Dec 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

BetterStorage
=============

Expand Down
Empty file modified gradlew
100644 → 100755
View file
Open in desktop
Empty file.
32 changes: 24 additions & 8 deletions src/main/java/net/mcft/copy/betterstorage/addon/Addon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,37 @@ public Addon(String modName) {
addons.add(this);
}

public void setupConfig() { }
public void setupConfig() {
// To be overwritten
}

public void initializeItems() { }
public void initializeItems() {
// To be overwritten
}

public void initializeBlocks() { }
public void initializeBlocks() {
// To be overwritten
}

public void addRecipes() { }
public void addRecipes() {
// To be overwritten
}

public void registerEntities() { }
public void registerEntities() {
// To be overwritten
}

public void registerTileEntities() { }
public void registerTileEntities() {
// To be overwritten
}

@SideOnly(Side.CLIENT)
public void registerRenderers() { }
public void registerRenderers() {
// To be overwritten
}

public void postInitialize() { }
public void postInitialize() {
// To be overwritten
}

}
1 change: 1 addition & 0 deletions src/main/java/net/mcft/copy/betterstorage/addon/thaumcraft/ThaumcraftAddon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ private void addItemAspects() {
addAspectsFor(BetterStorageTiles.craftingStation, -1, true, Aspect.CRAFT, 6, Aspect.MECHANISM, 4);

addAspectsFor(BetterStorageItems.itemBackpack, -1, true, Aspect.VOID, 4, Aspect.EXCHANGE, 6);
addAspectsFor(BetterStorageItems.itemCardboardBackpack, -1, true, Aspect.VOID, 4, Aspect.EXCHANGE, 6);
addAspectsFor(BetterStorageItems.itemEnderBackpack, -1, true, Aspect.DARKNESS, 8, Aspect.VOID, 4, Aspect.EXCHANGE, 8,
Aspect.TRAVEL, 4, Aspect.ELDRITCH, 4, Aspect.MAGIC, 4);

Expand Down
26 changes: 14 additions & 12 deletions src/main/java/net/mcft/copy/betterstorage/config/GlobalConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,19 @@ public class GlobalConfig extends Config {
public static IntegerSetting stationAutocraftDelaySetting;

// Tiles
public static final String crateEnabled = "tile.crate";
public static final String reinforcedChestEnabled = "tile.reinforcedChest";
public static final String lockerEnabled = "tile.locker";
public static final String armorStandEnabled = "tile.armorStand";
public static final String backpackEnabled = "tile.backpack";
public static final String enderBackpackEnabled = "tile.enderBackpack";
public static final String cardboardBoxEnabled = "tile.cardboardBox";
public static final String reinforcedLockerEnabled = "tile.reinforcedLocker";
public static final String craftingStationEnabled = "tile.craftingStation";
public static final String flintBlockEnabled = "tile.flintBlock";
public static final String lockableDoorEnabled = "tile.lockableDoor";
public static final String presentEnabled = "tile.present";
public static final String crateEnabled = "tile.crate";
public static final String reinforcedChestEnabled = "tile.reinforcedChest";
public static final String lockerEnabled = "tile.locker";
public static final String armorStandEnabled = "tile.armorStand";
public static final String backpackEnabled = "tile.backpack";
public static final String enderBackpackEnabled = "tile.enderBackpack";
public static final String cardboardBackpackEnabled = "tile.cardboardBackpack";
public static final String cardboardBoxEnabled = "tile.cardboardBox";
public static final String reinforcedLockerEnabled = "tile.reinforcedLocker";
public static final String craftingStationEnabled = "tile.craftingStation";
public static final String flintBlockEnabled = "tile.flintBlock";
public static final String lockableDoorEnabled = "tile.lockableDoor";
public static final String presentEnabled = "tile.present";

// Items
public static final String keyEnabled = "item.key";
Expand Down Expand Up @@ -94,6 +95,7 @@ public GlobalConfig(File file) {
new BooleanSetting(this, armorStandEnabled, true, "tile.betterstorage.armorStand.name").setHasComment(false).setRequiresMcRestart(true);
new BooleanSetting(this, backpackEnabled, true, "tile.betterstorage.backpack.name").setHasComment(false).setRequiresMcRestart(true);
new BooleanSetting(this, enderBackpackEnabled, true, "tile.betterstorage.enderBackpack.name").setHasComment(false).setRequiresMcRestart(true);
new BooleanSetting(this, cardboardBackpackEnabled, true, "tile.betterstorage.cardboardBackpack.name").setHasComment(false).setRequiresMcRestart(true);
new BooleanSetting(this, cardboardBoxEnabled, true, "tile.betterstorage.cardboardBox.name").setHasComment(false).setRequiresMcRestart(true);
new BooleanSetting(this, reinforcedLockerEnabled, true, "tile.betterstorage.reinforcedLocker.name").setHasComment(false).setRequiresMcRestart(true);
new BooleanSetting(this, craftingStationEnabled, true, "tile.betterstorage.craftingStation.name").setHasComment(false).setRequiresMcRestart(true);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/mcft/copy/betterstorage/content/BetterStorageEntities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public static void register() {
EntityRegistry.registerModEntity(EntityFrienderman.class, "Frienderman", 1, BetterStorage.instance, 64, 4, true);
EntityRegistry.registerModEntity(EntityCluckington.class, "Cluckington", 2, BetterStorage.instance, 64, 4, true);

Addon.registerEntitesAll();
//Addon.registerEntitesAll();

}

Expand Down
5 changes: 4 additions & 1 deletion src/main/java/net/mcft/copy/betterstorage/content/BetterStorageItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import net.mcft.copy.betterstorage.item.ItemBackpack;
import net.mcft.copy.betterstorage.item.ItemBucketSlime;
import net.mcft.copy.betterstorage.item.ItemDrinkingHelmet;
import net.mcft.copy.betterstorage.item.ItemCardboardBackpack;
import net.mcft.copy.betterstorage.item.ItemEnderBackpack;
import net.mcft.copy.betterstorage.item.ItemPresentBook;
import net.mcft.copy.betterstorage.item.cardboard.ItemCardboardArmor;
Expand Down Expand Up @@ -34,6 +35,7 @@ public final class BetterStorageItems {
public static ItemPresentBook presentBook;

public static ItemBackpack itemBackpack;
public static ItemCardboardBackpack itemCardboardBackpack;
public static ItemEnderBackpack itemEnderBackpack;

public static ItemCardboardArmor cardboardHelmet;
Expand Down Expand Up @@ -63,6 +65,7 @@ public static void initialize() {
presentBook = new ItemPresentBook();

itemBackpack = MiscUtils.conditionalNew(ItemBackpack.class, GlobalConfig.backpackEnabled);
itemCardboardBackpack = MiscUtils.conditionalNew(ItemCardboardBackpack.class, GlobalConfig.cardboardBackpackEnabled);
itemEnderBackpack = MiscUtils.conditionalNew(ItemEnderBackpack.class, GlobalConfig.enderBackpackEnabled);

cardboardHelmet = conditionalNewArmor(GlobalConfig.cardboardHelmetEnabled, 0);
Expand All @@ -89,7 +92,7 @@ public static void initialize() {
if (cardboardSheet != null)
OreDictionary.registerOre("sheetCardboard", cardboardSheet);

Addon.initializeItemsAll();
//Addon.initializeItemsAll();

}
private static ItemCardboardArmor conditionalNewArmor(String configName, int armorType) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/mcft/copy/betterstorage/content/BetterStorageTileEntities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public static void register() {
GameRegistry.registerTileEntity(TileEntityPresent.class, Constants.containerPresent);
GameRegistry.registerTileEntity(TileEntityLockableDoor.class, Constants.lockableDoor);

Addon.registerTileEntitesAll();
//Addon.registerTileEntitesAll();

}

Expand Down
28 changes: 16 additions & 12 deletions src/main/java/net/mcft/copy/betterstorage/content/BetterStorageTiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import net.mcft.copy.betterstorage.addon.Addon;
import net.mcft.copy.betterstorage.config.GlobalConfig;
import net.mcft.copy.betterstorage.tile.TileBackpack;
import net.mcft.copy.betterstorage.tile.TileCardboardBackpack;
import net.mcft.copy.betterstorage.tile.TileCardboardBox;
import net.mcft.copy.betterstorage.tile.TileCraftingStation;
import net.mcft.copy.betterstorage.tile.TileEnderBackpack;
Expand All @@ -24,6 +25,7 @@ public final class BetterStorageTiles {
public static TileArmorStand armorStand;
public static TileBackpack backpack;
public static TileEnderBackpack enderBackpack;
public static TileCardboardBackpack cardboardBackpack;
public static TileCardboardBox cardboardBox;
public static TileReinforcedLocker reinforcedLocker;
public static TileCraftingStation craftingStation;
Expand All @@ -35,20 +37,22 @@ private BetterStorageTiles() { }

public static void initialize() {

crate = MiscUtils.conditionalNew(TileCrate.class, GlobalConfig.crateEnabled);
reinforcedChest = MiscUtils.conditionalNew(TileReinforcedChest.class, GlobalConfig.reinforcedChestEnabled);
locker = MiscUtils.conditionalNew(TileLocker.class, GlobalConfig.lockerEnabled);
armorStand = MiscUtils.conditionalNew(TileArmorStand.class, GlobalConfig.armorStandEnabled);
backpack = MiscUtils.conditionalNew(TileBackpack.class, GlobalConfig.backpackEnabled);
enderBackpack = MiscUtils.conditionalNew(TileEnderBackpack.class, GlobalConfig.enderBackpackEnabled);
cardboardBox = MiscUtils.conditionalNew(TileCardboardBox.class, GlobalConfig.cardboardBoxEnabled);
reinforcedLocker = MiscUtils.conditionalNew(TileReinforcedLocker.class, GlobalConfig.reinforcedLockerEnabled);
craftingStation = MiscUtils.conditionalNew(TileCraftingStation.class, GlobalConfig.craftingStationEnabled);
flintBlock = MiscUtils.conditionalNew(TileFlintBlock.class, GlobalConfig.flintBlockEnabled);
lockableDoor = MiscUtils.conditionalNew(TileLockableDoor.class, GlobalConfig.lockableDoorEnabled);
present = MiscUtils.conditionalNew(TilePresent.class, GlobalConfig.presentEnabled);
crate = MiscUtils.conditionalNew(TileCrate.class, GlobalConfig.crateEnabled);
reinforcedChest = MiscUtils.conditionalNew(TileReinforcedChest.class, GlobalConfig.reinforcedChestEnabled);
locker = MiscUtils.conditionalNew(TileLocker.class, GlobalConfig.lockerEnabled);
armorStand = MiscUtils.conditionalNew(TileArmorStand.class, GlobalConfig.armorStandEnabled);
backpack = MiscUtils.conditionalNew(TileBackpack.class, GlobalConfig.backpackEnabled);
enderBackpack = MiscUtils.conditionalNew(TileEnderBackpack.class, GlobalConfig.enderBackpackEnabled);
cardboardBackpack = MiscUtils.conditionalNew(TileCardboardBackpack.class, GlobalConfig.cardboardBackpackEnabled);
cardboardBox = MiscUtils.conditionalNew(TileCardboardBox.class, GlobalConfig.cardboardBoxEnabled);
reinforcedLocker = MiscUtils.conditionalNew(TileReinforcedLocker.class, GlobalConfig.reinforcedLockerEnabled);
craftingStation = MiscUtils.conditionalNew(TileCraftingStation.class, GlobalConfig.craftingStationEnabled);
flintBlock = MiscUtils.conditionalNew(TileFlintBlock.class, GlobalConfig.flintBlockEnabled);
lockableDoor = MiscUtils.conditionalNew(TileLockableDoor.class, GlobalConfig.lockableDoorEnabled);
present = MiscUtils.conditionalNew(TilePresent.class, GlobalConfig.presentEnabled);

Addon.initializeTilesAll();
Addon.addRecipesAll();

}

Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/mcft/copy/betterstorage/misc/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public final class Constants {
public static final String containerArmorStand = "container." + modId + ".armorStand";
public static final String containerBackpack = "container." + modId + ".backpack";
public static final String containerEnderBackpack = "container." + modId + ".enderBackpack";
public static final String containerCardboardBackpack = "container." + modId + ".cardboardBackpack";
public static final String containerCardboardBox = "container." + modId + ".cardboardBox";
public static final String containerCraftingStation = "container." + modId + ".craftingStation";
public static final String containerPresent = "container." + modId + ".present";
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/net/mcft/copy/betterstorage/misc/Recipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public static void add() {
addCardboardRecipes();

GameRegistry.addRecipe(new DyeRecipe());
Addon.addRecipesAll();
//Addon.addRecipesAll();

}

Expand Down Expand Up @@ -264,6 +264,13 @@ private static void addCardboardRecipes() {
'/', Items.stick));
}

if (BetterStorageItems.itemCardboardBackpack != null) {
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(BetterStorageItems.itemCardboardBackpack),
" o ",
"ooo",
"ooo", 'o', "sheetCardboard"));
}

if (BetterStorageItems.anyCardboardItemsEnabled) {
// Crafting Station: Add cardboard enchantment recipe
BetterStorageCrafting.addStationRecipe(new CardboardEnchantmentRecipe());
Expand Down
23 changes: 12 additions & 11 deletions src/main/java/net/mcft/copy/betterstorage/misc/Resources.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,18 @@ public final class Resources {
public static final ResourceLocation containerReinforcedChest = new BetterStorageResource("textures/gui/reinforcedChest.png");
public static final ResourceLocation containerCraftingStation = new BetterStorageResource("textures/gui/craftingStation.png");

public static final ResourceLocation textureLocker = new BetterStorageResource("textures/models/locker/wood.png");
public static final ResourceLocation textureLockerLarge = new BetterStorageResource("textures/models/locker_large/wood.png");
public static final ResourceLocation textureArmorStand = new BetterStorageResource("textures/models/armorstand.png");
public static final ResourceLocation textureBackpack = new BetterStorageResource("textures/models/backpack.png");
public static final ResourceLocation textureBackpackOverlay = new BetterStorageResource("textures/models/backpack_overlay.png");
public static final ResourceLocation textureEnderBackpack = new BetterStorageResource("textures/models/enderBackpack.png");
public static final ResourceLocation textureDrinkingHelmet = new BetterStorageResource("textures/models/drinkingHelmet.png");
public static final ResourceLocation textureCardboardArmor = new BetterStorageResource("textures/models/cardboardArmor.png");
public static final ResourceLocation textureCardboardLeggins = new BetterStorageResource("textures/models/cardboardArmor_leggings.png");
public static final ResourceLocation textureCluckOverlay = new BetterStorageResource("textures/models/cluck.png");
public static final ResourceLocation texturePresentOverlay = new BetterStorageResource("textures/models/present_overlay.png");
public static final ResourceLocation textureLocker = new BetterStorageResource("textures/models/locker/wood.png");
public static final ResourceLocation textureLockerLarge = new BetterStorageResource("textures/models/locker_large/wood.png");
public static final ResourceLocation textureArmorStand = new BetterStorageResource("textures/models/armorstand.png");
public static final ResourceLocation textureBackpack = new BetterStorageResource("textures/models/backpack.png");
public static final ResourceLocation textureBackpackOverlay = new BetterStorageResource("textures/models/backpack_overlay.png");
public static final ResourceLocation textureEnderBackpack = new BetterStorageResource("textures/models/enderBackpack.png");
public static final ResourceLocation textureCardboardBackpack = new BetterStorageResource("textures/models/cardboardBackpack.png");
public static final ResourceLocation textureDrinkingHelmet = new BetterStorageResource("textures/models/drinkingHelmet.png");
public static final ResourceLocation textureCardboardArmor = new BetterStorageResource("textures/models/cardboardArmor.png");
public static final ResourceLocation textureCardboardLeggins = new BetterStorageResource("textures/models/cardboardArmor_leggings.png");
public static final ResourceLocation textureCluckOverlay = new BetterStorageResource("textures/models/cluck.png");
public static final ResourceLocation texturePresentOverlay = new BetterStorageResource("textures/models/present_overlay.png");

public static final ResourceLocation modelLocker = new BetterStorageResource("models/locker.obj");
public static final ResourceLocation modelLockerLarge = new BetterStorageResource("models/locker_large.obj");
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/mcft/copy/betterstorage/proxy/ClientProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ private void registerRenderers() {
lockableDoorRenderId = registerTileEntityRenderer(TileEntityLockableDoor.class, new TileEntityLockableDoorRenderer());
presentRenderId = registerTileEntityRenderer(TileEntityPresent.class, new TileEntityPresentRenderer());
RenderingRegistry.registerBlockHandler(new TileLockableDoorRenderingHandler());
Addon.registerRenderersAll();
//Addon.registerRenderersAll();

}

Expand Down
8 changes: 6 additions & 2 deletions src/main/java/net/mcft/copy/betterstorage/tile/TileLocker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,12 @@ public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirecti

@Override
public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) {
float minX = 0, minY = 0, minZ = 0;
float maxX = 1, maxY = 1, maxZ = 1;
float minX = 0;
float minY = 0;
float minZ = 0;
float maxX = 1;
float maxY = 1;
float maxZ = 1;
switch (WorldUtils.get(world, x, y, z, TileEntityLocker.class).getOrientation()) {
case EAST: maxX -= 1.0F / 16; break;
case WEST: minX += 1.0F / 16; break;
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/net/mcft/copy/betterstorage/tile/TileReinforcedLocker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,12 @@ public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirecti

@Override
public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) {
float minX = 0, minY = 0, minZ = 0;
float maxX = 1, maxY = 1, maxZ = 1;
float minX = 0;
float minY = 0;
float minZ = 0;
float maxX = 1;
float maxY = 1;
float maxZ = 1;
switch (WorldUtils.get(world, x, y, z, TileEntityLocker.class).getOrientation()) {
case EAST: maxX -= 1.0F / 16; break;
case WEST: minX += 1.0F / 16; break;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/net/mcft/copy/betterstorage/tile/crate/CrateItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ public int get(ItemIdentifier item) {
* and marks the weighted map as dirty if necessary. */
public void set(ItemIdentifier item, int amount) {
ItemStack stack = itemsMap.get(item);
int stacksBefore, stacksAfter;
int stacksBefore;
int stacksAfter;
if (stack != null) {
if (amount == stack.stackSize) return;
stacksBefore = StackUtils.calcNumStacks(stack);
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/net/mcft/copy/betterstorage/tile/crate/CratePileMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,12 @@ public void set(int x, int y, int z, boolean value) {
if (region.contains(x, y, z)) {
internalSet(x - mapRegion.minX, y - mapRegion.minY * 8, z - mapRegion.minZ, value);
if (!value) {
int minX = region.minX, minY = region.minY, minZ = region.minZ;
int maxX = region.maxX, maxY = region.maxY, maxZ = region.maxZ;
int minX = region.minX;
int minY = region.minY;
int minZ = region.minZ;
int maxX = region.maxX;
int maxY = region.maxY;
int maxZ = region.maxZ;
if ((x == minX) && checkCuboid(minX, minY, minZ, minX, maxY, maxZ)) region.minX += 1;
if ((y == minY) && checkCuboid(minX, minY, minZ, maxX, minY, maxZ)) region.minY += 1;
if ((z == minZ) && checkCuboid(minX, minY, minZ, maxX, maxY, minZ)) region.minZ += 1;
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/net/mcft/copy/betterstorage/tile/crate/TileEntityCrate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ private void setPileData(CratePileData data, boolean addCrate) {
/** Destroys all crates above, and makes sure when piles split,
* each pile gets their own CratePileData object. */
private void checkPileConnections(CratePileData data) {
int x = xCoord, y = yCoord, z = zCoord;
int x = xCoord;
int y = yCoord;
int z = zCoord;

// Destroy all crates above.
TileEntityCrate crateAbove = WorldUtils.get(worldObj, x, y + 1, z, TileEntityCrate.class);
Expand Down
Loading