Flatten craft patterns, also refactor crafty crate a bit

This commit is contained in:
Vincent Lee committed 2017-12-21 22:52:30 -06:00
1 parent daa1362d41
commit b70bb95c1b
38 files changed
+219 -205

No files matched your search

@@ -8,21 +8,51 @@
*/
package vazkii.botania.api.state.enums;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import net.minecraft.util.IStringSerializable;
import java.util.List;
import java.util.Locale;
public enum CratePattern implements IStringSerializable {
NONE,
CRAFTY_1_1,
CRAFTY_2_2,
CRAFTY_1_2,
CRAFTY_2_1,
CRAFTY_1_3,
CRAFTY_3_1,
CRAFTY_2_3,
CRAFTY_3_2,
CRAFTY_DONUT;
NONE(true, true, true,
true, true, true,
true, true, true),
CRAFTY_1_1( true, false, false,
false, false, false,
false, false, false),
CRAFTY_2_2( true, true, false,
true, true, false,
false, false, false),
CRAFTY_1_2( true, false, false,
true, false, false,
false, false, false),
CRAFTY_2_1( true, true, false,
false, false, false,
false, false, false),
CRAFTY_1_3( true, false, false,
true, false, false,
true, false, false),
CRAFTY_3_1( true, true, true,
false, false, false,
false, false, false),
CRAFTY_2_3( true, true, false,
true, true, false,
true, true, false),
CRAFTY_3_2( true, true, true,
true, true, true,
false, false, false),
CRAFTY_DONUT(true, true, true,
true, false, true,
true, true, true);
public final List<Boolean> openSlots;
CratePattern(Boolean... pattern) {
this.openSlots = ImmutableList.copyOf(pattern);
Preconditions.checkArgument(this.openSlots.size() == 9, "Malformed pattern");
}
@Override
public String getName() {
@@ -87,6 +87,7 @@ import vazkii.botania.common.entity.EntitySignalFlare;
import vazkii.botania.common.entity.EntitySpark;
import vazkii.botania.common.entity.ModEntities;
import vazkii.botania.common.fixers.AttachedWills;
import vazkii.botania.common.fixers.CraftyCrateTE;
import vazkii.botania.common.fixers.FlattenItems;
import vazkii.botania.common.fixers.FlattenNBT;
import vazkii.botania.common.lexicon.LexiconData;
@@ -143,6 +144,7 @@ public class Botania {
fixer.registerFix(FixTypes.ITEM_INSTANCE, new FlattenItems());
fixer.registerFix(FixTypes.ITEM_INSTANCE, new FlattenNBT());
fixer.registerFix(FixTypes.ITEM_INSTANCE, new AttachedWills());
fixer.registerFix(FixTypes.BLOCK_ENTITY, new CraftyCrateTE());
if(Botania.gardenOfGlassLoaded)
new WorldTypeSkyblock();
@@ -85,7 +85,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable,
TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos);
if (te instanceof TileCraftCrate) {
TileCraftCrate tile = (TileCraftCrate) te;
state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.values()[tile.pattern + 1]);
state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, tile.pattern);
} else {
state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE);
}
@@ -170,8 +170,8 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable,
int yp = yc + i * 18;
boolean enabled = true;
if(craft.pattern > -1)
enabled = TileCraftCrate.PATTERNS[craft.pattern][index];
if(craft.pattern != CratePattern.NONE)
enabled = craft.pattern.openSlots.get(index);
Gui.drawRect(xp, yp, xp + 16, yp + 16, enabled ? 0x22FFFFFF : 0x22FF0000);
@@ -21,55 +21,15 @@ import net.minecraft.network.play.server.SPacketUpdateTileEntity;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import vazkii.botania.api.internal.VanillaPacketDispatcher;
import vazkii.botania.api.state.enums.CratePattern;
import vazkii.botania.common.item.ModItems;
import javax.annotation.Nonnull;
public class TileCraftCrate extends TileOpenCrate {
public static final String TAG_PATTERN = "pattern";
public static final boolean[][] PATTERNS = new boolean[][] {
{
true, false, false,
false, false, false,
false, false, false
}, {
true, true, false,
true, true, false,
false, false, false
}, {
true, false, false,
true, false, false,
false, false, false
}, {
true, true, false,
false, false, false,
false, false, false
}, {
true, false, false,
true, false, false,
true, false, false
}, {
true, true, true,
false, false, false,
false, false, false
}, {
true, true, false,
true, true, false,
true, true, false
}, {
true, true, true,
true, true, true,
false, false, false
}, {
true, true, true,
true, false, true,
true, true, true
}
};
private static final String TAG_PATTERN = "pattern";
public int pattern = -1;
public CratePattern pattern = CratePattern.NONE;
private int signal = 0;
@Override
@@ -95,8 +55,8 @@ public class TileCraftCrate extends TileOpenCrate {
};
}
public boolean isLocked(int slot) {
return pattern != -1 && !PATTERNS[pattern][slot];
private boolean isLocked(int slot) {
return !pattern.openSlots.get(slot);
}
@Override
@@ -176,13 +136,13 @@ public class TileCraftCrate extends TileOpenCrate {
@Override
public void writePacketNBT(NBTTagCompound par1nbtTagCompound) {
super.writePacketNBT(par1nbtTagCompound);
par1nbtTagCompound.setInteger(TAG_PATTERN, pattern);
par1nbtTagCompound.setInteger(TAG_PATTERN, pattern.ordinal());
}
@Override
public void readPacketNBT(NBTTagCompound par1nbtTagCompound) {
super.readPacketNBT(par1nbtTagCompound);
pattern = par1nbtTagCompound.getInteger(TAG_PATTERN);
pattern = CratePattern.values()[par1nbtTagCompound.getInteger(TAG_PATTERN)];
}
@Override
@@ -207,7 +167,7 @@ public class TileCraftCrate extends TileOpenCrate {
@Override
public void onDataPacket(NetworkManager manager, SPacketUpdateTileEntity packet) {
int lastPattern = pattern;
CratePattern lastPattern = pattern;
super.onDataPacket(manager, packet);
if(pattern != lastPattern)
world.markBlockRangeForRenderUpdate(pos, pos);
@@ -156,8 +156,18 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addBlock(ModBlocks.livingrock);
addBlock(ModBlocks.livingwood);
addBlock(ModBlocks.openCrate);
addItem(ModItems.craftPattern);
addItem(ModItems.craftPattern1_1);
addItem(ModItems.craftPattern2_2);
addItem(ModItems.craftPattern1_2);
addItem(ModItems.craftPattern2_1);
addItem(ModItems.craftPattern1_3);
addItem(ModItems.craftPattern3_1);
addItem(ModItems.craftPattern2_3);
addItem(ModItems.craftPattern3_2);
addItem(ModItems.craftPatternDonut);
addBlock(ModBlocks.platform);
addBlock(ModBlocks.alfPortal);
addBlock(ModBlocks.altar);
@@ -500,7 +500,7 @@ public final class ModCraftingRecipes {
recipeGatherDrum = path("forestdrum_1");
recipePlaceholder = ModItems.placeholder.getRegistryName();
recipeCraftCrate = path("opencrate_1");
recipesPatterns = allOfGroup("craftpattern");
recipesPatterns = allOfGroup("craft_pattern");
recipeBrewery = ModBlocks.brewery.getRegistryName();
recipeVial = ModItems.vial.getRegistryName();
recipeFlask = ModItems.flask.getRegistryName();
@@ -0,0 +1,22 @@
package vazkii.botania.common.fixers;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.datafix.IFixableData;
import vazkii.botania.common.block.tile.TileCraftCrate;
// Shifts pattern tag in Crafty Crate TE NBT up one to account for CratePattern.NONE
public class CraftyCrateTE implements IFixableData {
@Override
public int getFixVersion() {
return 1;
}
@Override
public NBTTagCompound fixTagCompound(NBTTagCompound compound) {
if(TileEntity.getKey(TileCraftCrate.class).toString().equals(compound.getString("id"))) {
compound.setInteger(TileCraftCrate.TAG_PATTERN, compound.getInteger(TileCraftCrate.TAG_PATTERN) + 1);
}
return compound;
}
}
@@ -5,6 +5,7 @@ import net.minecraft.item.EnumDyeColor;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.datafix.IFixableData;
import vazkii.botania.api.item.IAncientWillContainer;
import vazkii.botania.api.state.enums.CratePattern;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibItemNames;
import vazkii.botania.common.lib.LibMisc;
@@ -96,6 +97,11 @@ public class FlattenItems implements IFixableData {
IAncientWillContainer.AncientWillType[] vals = IAncientWillContainer.AncientWillType.values();
return LibMisc.MOD_ID + ":" + LibItemNames.ANCIENT_WILL + "_" + vals[i & vals.length].name().toLowerCase(Locale.ROOT);
});
LOOKUP.put("botania:craftpattern", i -> {
// +1 since there was no NONE meta variant
CratePattern[] vals = CratePattern.values();
return LibMisc.MOD_ID + ":" + LibItemNames.CRAFT_PATTERN + "_" + vals[(i + 1) % vals.length].name().toLowerCase(Locale.ROOT);
});
}
@Override
@@ -10,29 +10,26 @@
*/
package vazkii.botania.common.item;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.api.state.enums.CratePattern;
import vazkii.botania.common.block.tile.TileCraftCrate;
import vazkii.botania.common.lib.LibItemNames;
import javax.annotation.Nonnull;
import java.util.Locale;
public class ItemCraftPattern extends ItemMod {
public final CratePattern pattern;
public ItemCraftPattern() {
super(LibItemNames.CRAFT_PATTERN);
setHasSubtypes(true);
public ItemCraftPattern(CratePattern pattern) {
super(LibItemNames.CRAFT_PATTERN + "_" + pattern.name().toLowerCase(Locale.ROOT));
this.pattern = pattern;
setMaxStackSize(1);
}
@@ -42,31 +39,10 @@ public class ItemCraftPattern extends ItemMod {
TileEntity tile = world.getTileEntity(pos);
if(tile != null && tile instanceof TileCraftCrate) {
TileCraftCrate crate = (TileCraftCrate) tile;
crate.pattern = p.getHeldItem(hand).getItemDamage();
crate.pattern = this.pattern;
world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 8);
return EnumActionResult.SUCCESS;
}
return EnumActionResult.PASS;
}
@Override
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> list) {
if(isInCreativeTab(tab)) {
for(int i = 0; i < TileCraftCrate.PATTERNS.length; i++)
list.add(new ItemStack(this, 1, i));
}
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage();
}
@SideOnly(Side.CLIENT)
@Override
public void registerModels() {
ModelHandler.registerItemAppendMeta(this, 9, LibItemNames.CRAFT_PATTERN);
}
}
@@ -24,6 +24,7 @@ import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.api.mana.spark.SparkUpgradeType;
import vazkii.botania.api.item.IAncientWillContainer;
import vazkii.botania.api.state.enums.CratePattern;
import vazkii.botania.common.item.brew.ItemBrewFlask;
import vazkii.botania.common.item.brew.ItemBrewVial;
import vazkii.botania.common.item.brew.ItemIncenseStick;
@@ -287,7 +288,15 @@ public final class ModItems {
public static final Item thornChakram = new ItemThornChakram(LibItemNames.THORN_CHAKRAM);
public static final Item flareChakram = new ItemThornChakram(LibItemNames.FLARE_CHAKRAM);
public static final Item overgrowthSeed = new ItemOvergrowthSeed();
public static final Item craftPattern = new ItemCraftPattern();
public static final Item craftPattern1_1 = new ItemCraftPattern(CratePattern.CRAFTY_1_1);
public static final Item craftPattern2_2 = new ItemCraftPattern(CratePattern.CRAFTY_2_2);
public static final Item craftPattern1_2 = new ItemCraftPattern(CratePattern.CRAFTY_1_2);
public static final Item craftPattern2_1 = new ItemCraftPattern(CratePattern.CRAFTY_2_1);
public static final Item craftPattern1_3 = new ItemCraftPattern(CratePattern.CRAFTY_1_3);
public static final Item craftPattern3_1 = new ItemCraftPattern(CratePattern.CRAFTY_3_1);
public static final Item craftPattern2_3 = new ItemCraftPattern(CratePattern.CRAFTY_2_3);
public static final Item craftPattern3_2 = new ItemCraftPattern(CratePattern.CRAFTY_3_2);
public static final Item craftPatternDonut = new ItemCraftPattern(CratePattern.CRAFTY_DONUT);
public static final Item ancientWillAhrim = new ItemAncientWill(IAncientWillContainer.AncientWillType.AHRIM);
public static final Item ancientWillDharok = new ItemAncientWill(IAncientWillContainer.AncientWillType.DHAROK);
public static final Item ancientWillGuthan = new ItemAncientWill(IAncientWillContainer.AncientWillType.GUTHAN);
@@ -516,7 +525,15 @@ public final class ModItems {
r.register(thornChakram);
r.register(flareChakram);
r.register(overgrowthSeed);
r.register(craftPattern);
r.register(craftPattern1_1);
r.register(craftPattern2_2);
r.register(craftPattern1_2);
r.register(craftPattern2_1);
r.register(craftPattern1_3);
r.register(craftPattern3_1);
r.register(craftPattern2_3);
r.register(craftPattern3_2);
r.register(craftPatternDonut);
r.register(ancientWillAhrim);
r.register(ancientWillDharok);
r.register(ancientWillGuthan);
@@ -125,7 +125,7 @@ public final class LibItemNames {
public static final String THORN_CHAKRAM = "thorn_chakram";
public static final String FLARE_CHAKRAM = "flare_chakram";
public static final String OVERGROWTH_SEED = "overgrowthSeed";
public static final String CRAFT_PATTERN = "craftPattern";
public static final String CRAFT_PATTERN = "pattern";
public static final String ANCIENT_WILL = "ancient_will";
public static final String CORPOREA_SPARK = "corporeaSpark";
public static final String LIVINGWOOD_BOW = "livingwoodBow";