mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-20 20:22:33 +00:00
Flatten lens
This commit is contained in:
1 parent
02fbb7f957
commit
1637680750
74 files changed
+659
-735
No files matched your search
@@ -5,9 +5,11 @@ import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.color.BlockColors;
|
||||
import net.minecraft.client.renderer.color.IBlockColor;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.client.renderer.color.ItemColors;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.EnumDyeColor;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
@@ -33,6 +35,7 @@ import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemBloodPendant;
|
||||
import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick;
|
||||
import vazkii.botania.common.item.lens.ItemLens;
|
||||
import vazkii.botania.common.lib.LibMisc;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.util.Map;
|
||||
@@ -155,7 +158,13 @@ public final class ColorHandler {
|
||||
|
||||
items.registerItemColorHandler((s, t) -> t == 1 && ItemTerraPick.isEnabled(s) ? Color.HSBtoRGB(0.375F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F) : -1, ModItems.terraPick);
|
||||
|
||||
items.registerItemColorHandler((s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1, ModItems.lens);
|
||||
// todo 1.13 use tags instead of looping registry
|
||||
IItemColor handler = (s, t) -> t == 0 ? ((ItemLens) s.getItem()).getLensColor(s) : -1;
|
||||
for (Item i : Item.REGISTRY) {
|
||||
if(i instanceof ItemLens && i.getRegistryName().getResourceDomain().equals(LibMisc.MOD_ID)) {
|
||||
items.registerItemColorHandler(handler, i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private ColorHandler() {}
|
||||
|
||||
@@ -298,7 +298,30 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
addBlock(ModBlocks.spreader);
|
||||
addBlock(ModBlocks.turntable);
|
||||
addBlock(ModBlocks.prism);
|
||||
addItem(ModItems.lens);
|
||||
addItem(ModItems.lensNormal);
|
||||
addItem(ModItems.lensSpeed);
|
||||
addItem(ModItems.lensPower);
|
||||
addItem(ModItems.lensTime);
|
||||
addItem(ModItems.lensEfficiency);
|
||||
addItem(ModItems.lensBounce);
|
||||
addItem(ModItems.lensGravity);
|
||||
addItem(ModItems.lensMine);
|
||||
addItem(ModItems.lensDamage);
|
||||
addItem(ModItems.lensPhantom);
|
||||
addItem(ModItems.lensMagnet);
|
||||
addItem(ModItems.lensExplosive);
|
||||
addItem(ModItems.lensInfluence);
|
||||
addItem(ModItems.lensWeight);
|
||||
addItem(ModItems.lensPaint);
|
||||
addItem(ModItems.lensFire);
|
||||
addItem(ModItems.lensPiston);
|
||||
addItem(ModItems.lensLight);
|
||||
addItem(ModItems.lensWarp);
|
||||
addItem(ModItems.lensRedirect);
|
||||
addItem(ModItems.lensFirework);
|
||||
addItem(ModItems.lensFlare);
|
||||
addItem(ModItems.lensMessenger);
|
||||
addItem(ModItems.lensTripwire);
|
||||
addItem(ModItems.manaGun);
|
||||
addItem(ModItems.clip);
|
||||
addItem(ModItems.spark);
|
||||
|
||||
@@ -445,30 +445,32 @@ public final class ModCraftingRecipes {
|
||||
recipesSparkUpgrades = allOfGroup("spark_upgrade");
|
||||
recipeRFGenerator = ModBlocks.rfGenerator.getRegistryName();
|
||||
|
||||
recipesManaLens = ImmutableList.of(path("lens_0_glass_block"), path("lens_0_glass_pane"));
|
||||
recipeLensVelocity = path("lens_1");
|
||||
recipeLensPotency = path("lens_2");
|
||||
recipeLensResistance = path("lens_3");
|
||||
recipeLensEfficiency = path("lens_4");
|
||||
recipeLensBounce = path("lens_5");
|
||||
recipeLensGravity = path("lens_6");
|
||||
recipeLensBore = path("lens_7");
|
||||
recipeLensDamaging = path("lens_8");
|
||||
recipeLensPhantom = path("lens_9");
|
||||
recipeLensMagnet = path("lens_10");
|
||||
recipeLensExplosive = path("lens_11");
|
||||
recipeLensInfluence = path("lens_12");
|
||||
recipeLensWeight = path("lens_13");
|
||||
recipeLensPaint = path("lens_14");
|
||||
recipeLensFire = path("lens_15");
|
||||
recipeLensPiston = path("lens_16");
|
||||
recipesLensFlash = ImmutableList.of(path("lens_17"), path("lens_17_alt"));
|
||||
recipeLensWarp = path("lens_18");
|
||||
recipeLensRedirect = path("lens_19");
|
||||
recipeLensFirework = path("lens_20");
|
||||
recipeLensFlare = path("lens_21");
|
||||
recipeLensMessenger = path("lens_22");
|
||||
recipeLensTripwire = path("lens_23");
|
||||
ResourceLocation name = ModItems.lensNormal.getRegistryName();
|
||||
recipesManaLens = ImmutableList.of(path(name.getResourcePath() + "_glass_block"), path(name.getResourcePath() + "_glass_pane"));
|
||||
recipeLensVelocity = ModItems.lensSpeed.getRegistryName();
|
||||
recipeLensPotency = ModItems.lensPower.getRegistryName();
|
||||
recipeLensResistance = ModItems.lensTime.getRegistryName();
|
||||
recipeLensEfficiency = ModItems.lensEfficiency.getRegistryName();
|
||||
recipeLensBounce = ModItems.lensBounce.getRegistryName();
|
||||
recipeLensGravity = ModItems.lensGravity.getRegistryName();
|
||||
recipeLensBore = ModItems.lensMine.getRegistryName();
|
||||
recipeLensDamaging = ModItems.lensDamage.getRegistryName();
|
||||
recipeLensPhantom = ModItems.lensPhantom.getRegistryName();
|
||||
recipeLensMagnet = ModItems.lensMagnet.getRegistryName();
|
||||
recipeLensExplosive = ModItems.lensExplosive.getRegistryName();
|
||||
recipeLensInfluence = ModItems.lensInfluence.getRegistryName();
|
||||
recipeLensWeight = ModItems.lensWeight.getRegistryName();
|
||||
recipeLensPaint = ModItems.lensPaint.getRegistryName();
|
||||
recipeLensFire = ModItems.lensFire.getRegistryName();
|
||||
recipeLensPiston = ModItems.lensPiston.getRegistryName();
|
||||
name = ModItems.lensLight.getRegistryName();
|
||||
recipesLensFlash = ImmutableList.of(name, path(name.getResourcePath() + "_alt"));
|
||||
recipeLensWarp = ModItems.lensWarp.getRegistryName();
|
||||
recipeLensRedirect = ModItems.lensRedirect.getRegistryName();
|
||||
recipeLensFirework = ModItems.lensFirework.getRegistryName();
|
||||
recipeLensFlare = ModItems.lensFlare.getRegistryName();
|
||||
recipeLensMessenger = ModItems.lensMessenger.getRegistryName();
|
||||
recipeLensTripwire = ModItems.lensTripwire.getRegistryName();
|
||||
|
||||
recipeDistributor = ModBlocks.distributor.getRegistryName();
|
||||
recipeManaVoid = ModBlocks.manaVoid.getRegistryName();
|
||||
|
||||
@@ -75,7 +75,7 @@ public class CompositeLensRecipe extends IForgeRegistryEntry.Impl<IRecipe> imple
|
||||
return ItemStack.EMPTY;
|
||||
|
||||
ItemStack lensCopy = lens.copy();
|
||||
((ItemLens) ModItems.lens).setCompositeLens(lensCopy, secondLens);
|
||||
((ItemLens) lens.getItem()).setCompositeLens(lensCopy, secondLens);
|
||||
|
||||
return lensCopy;
|
||||
}
|
||||
|
||||
@@ -73,8 +73,7 @@ public class EntityManaStorm extends Entity {
|
||||
burst.setManaLossPerTick(1F);
|
||||
burst.setGravity(0F);
|
||||
|
||||
ItemStack lens = new ItemStack(ModItems.lens, 1, ItemLens.STORM);
|
||||
burst.setSourceLens(lens);
|
||||
burst.setSourceLens(new ItemStack(ModItems.lensStorm));
|
||||
|
||||
Vector3 motion = new Vector3(Math.random() - 0.5, Math.random() - 0.5, Math.random() - 0.5).normalize().multiply(motionModifier);
|
||||
burst.setMotion(motion.x, motion.y, motion.z);
|
||||
|
||||
@@ -47,6 +47,7 @@ public class FlattenItems implements IFixableData {
|
||||
case 2: return LibMisc.MOD_ID + ":" + LibItemNames.SNOW_HORN;
|
||||
}
|
||||
});
|
||||
LOOKUP.put("botania:lens", i -> LibMisc.MOD_ID + ":" + LibItemNames.LENS_NAMES[i % LibItemNames.LENS_NAMES.length]);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -64,7 +64,7 @@ import vazkii.botania.common.item.interaction.thaumcraft.ItemElementiumHelmRevea
|
||||
import vazkii.botania.common.item.interaction.thaumcraft.ItemManaInkwell;
|
||||
import vazkii.botania.common.item.interaction.thaumcraft.ItemManasteelHelmRevealing;
|
||||
import vazkii.botania.common.item.interaction.thaumcraft.ItemTerrasteelHelmRevealing;
|
||||
import vazkii.botania.common.item.lens.ItemLens;
|
||||
import vazkii.botania.common.item.lens.*;
|
||||
import vazkii.botania.common.item.material.ItemDye;
|
||||
import vazkii.botania.common.item.material.ItemManaResource;
|
||||
import vazkii.botania.common.item.material.ItemPestleAndMortar;
|
||||
@@ -128,7 +128,32 @@ public final class ModItems {
|
||||
public static final Item manaweaveCloth = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[22]);
|
||||
public static final Item manaPowder = new ItemManaResource(LibItemNames.MANA_RESOURCE_NAMES[23]);
|
||||
|
||||
public static final Item lens = new ItemLens();
|
||||
public static final Item lensNormal = new ItemLens(LibItemNames.LENS_NAMES[0], new Lens(), ItemLens.PROP_NONE);
|
||||
public static final Item lensSpeed = new ItemLens(LibItemNames.LENS_NAMES[1], new LensSpeed(), ItemLens.PROP_NONE);
|
||||
public static final Item lensPower = new ItemLens(LibItemNames.LENS_NAMES[2], new LensPower(), ItemLens.PROP_POWER);
|
||||
public static final Item lensTime = new ItemLens(LibItemNames.LENS_NAMES[3], new LensTime(), ItemLens.PROP_NONE);
|
||||
public static final Item lensEfficiency = new ItemLens(LibItemNames.LENS_NAMES[4], new LensEfficiency(), ItemLens.PROP_NONE);
|
||||
public static final Item lensBounce = new ItemLens(LibItemNames.LENS_NAMES[5], new LensBounce(), ItemLens.PROP_TOUCH);
|
||||
public static final Item lensGravity = new ItemLens(LibItemNames.LENS_NAMES[6], new LensGravity(), ItemLens.PROP_ORIENTATION);
|
||||
public static final Item lensMine = new ItemLens(LibItemNames.LENS_NAMES[7], new LensMine(), ItemLens.PROP_TOUCH | ItemLens.PROP_ORIENTATION);
|
||||
public static final Item lensDamage = new ItemLens(LibItemNames.LENS_NAMES[8], new LensDamage(), ItemLens.PROP_DAMAGE);
|
||||
public static final Item lensPhantom = new ItemLens(LibItemNames.LENS_NAMES[9], new LensPhantom(), ItemLens.PROP_TOUCH);
|
||||
public static final Item lensMagnet = new ItemLens(LibItemNames.LENS_NAMES[10], new LensMagnet(), ItemLens.PROP_ORIENTATION);
|
||||
public static final Item lensExplosive = new ItemLens(LibItemNames.LENS_NAMES[11], new LensExplosive(), ItemLens.PROP_DAMAGE | ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION);
|
||||
public static final Item lensInfluence = new ItemLens(LibItemNames.LENS_NAMES[12], new LensInfluence(), ItemLens.PROP_NONE);
|
||||
public static final Item lensWeight = new ItemLens(LibItemNames.LENS_NAMES[13], new LensWeight(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION);
|
||||
public static final Item lensPaint = new ItemLens(LibItemNames.LENS_NAMES[14], new LensPaint(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION);
|
||||
public static final Item lensFire = new ItemLens(LibItemNames.LENS_NAMES[15], new LensFire(), ItemLens.PROP_DAMAGE | ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION);
|
||||
public static final Item lensPiston = new ItemLens(LibItemNames.LENS_NAMES[16], new LensPiston(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION);
|
||||
public static final Item lensLight = new ItemLens(LibItemNames.LENS_NAMES[17], new LensLight(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION);
|
||||
public static final Item lensWarp = new ItemLens(LibItemNames.LENS_NAMES[18], new LensWarp(), ItemLens.PROP_NONE);
|
||||
public static final Item lensRedirect = new ItemLens(LibItemNames.LENS_NAMES[19], new LensRedirect(), ItemLens.PROP_TOUCH | ItemLens.PROP_INTERACTION);
|
||||
public static final Item lensFirework = new ItemLens(LibItemNames.LENS_NAMES[20], new LensFirework(), ItemLens.PROP_TOUCH);
|
||||
public static final Item lensFlare = new ItemLens(LibItemNames.LENS_NAMES[21], new LensFlare(), ItemLens.PROP_CONTROL);
|
||||
public static final Item lensMessenger = new ItemLens(LibItemNames.LENS_NAMES[22], new LensMessenger(), ItemLens.PROP_POWER);
|
||||
public static final Item lensTripwire = new ItemLens(LibItemNames.LENS_NAMES[23], new LensTripwire(), ItemLens.PROP_CONTROL);
|
||||
public static final Item lensStorm = new ItemLens(LibItemNames.LENS_NAMES[24], new LensStorm(), ItemLens.PROP_NONE);
|
||||
|
||||
public static final Item rune = new ItemRune();
|
||||
public static final Item manaTablet = new ItemManaTablet();
|
||||
public static final Item manaGun = new ItemManaGun();
|
||||
@@ -316,7 +341,31 @@ public final class ModItems {
|
||||
r.register(pebble);
|
||||
r.register(manaweaveCloth);
|
||||
r.register(manaPowder);
|
||||
r.register(lens);
|
||||
r.register(lensNormal);
|
||||
r.register(lensSpeed);
|
||||
r.register(lensPower);
|
||||
r.register(lensTime);
|
||||
r.register(lensEfficiency);
|
||||
r.register(lensBounce);
|
||||
r.register(lensGravity);
|
||||
r.register(lensMine);
|
||||
r.register(lensDamage);
|
||||
r.register(lensPhantom);
|
||||
r.register(lensMagnet);
|
||||
r.register(lensExplosive);
|
||||
r.register(lensInfluence);
|
||||
r.register(lensWeight);
|
||||
r.register(lensPaint);
|
||||
r.register(lensFire);
|
||||
r.register(lensPiston);
|
||||
r.register(lensLight);
|
||||
r.register(lensWarp);
|
||||
r.register(lensRedirect);
|
||||
r.register(lensFirework);
|
||||
r.register(lensFlare);
|
||||
r.register(lensMessenger);
|
||||
r.register(lensTripwire);
|
||||
r.register(lensStorm);
|
||||
r.register(rune);
|
||||
r.register(manaTablet);
|
||||
r.register(manaGun);
|
||||
|
||||
@@ -34,6 +34,7 @@ import vazkii.botania.client.core.handler.ModelHandler;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
import vazkii.botania.common.item.ItemMod;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
@@ -41,37 +42,7 @@ import java.awt.Color;
|
||||
import java.util.List;
|
||||
|
||||
public class ItemLens extends ItemMod implements ILensControl, ICompositableLens, ITinyPlanetExcempt {
|
||||
|
||||
public static final int SUBTYPES = 24;
|
||||
|
||||
public static final int NORMAL = 0,
|
||||
SPEED = 1,
|
||||
POWER = 2,
|
||||
TIME = 3,
|
||||
EFFICIENCY = 4,
|
||||
BOUNCE = 5,
|
||||
GRAVITY = 6,
|
||||
MINE = 7,
|
||||
DAMAGE = 8,
|
||||
PHANTOM = 9,
|
||||
MAGNET = 10,
|
||||
EXPLOSIVE = 11,
|
||||
INFLUENCE = 12,
|
||||
WEIGHT = 13,
|
||||
PAINT = 14,
|
||||
FIRE = 15,
|
||||
PISTON = 16,
|
||||
LIGHT = 17,
|
||||
WARP = 18,
|
||||
REDIRECT = 19,
|
||||
FIREWORK = 20,
|
||||
FLARE = 21,
|
||||
MESSENGER = 22,
|
||||
TRIPWIRE = 23;
|
||||
|
||||
public static final int STORM = 5000;
|
||||
|
||||
private static final int PROP_NONE = 0,
|
||||
public static final int PROP_NONE = 0,
|
||||
PROP_POWER = 1,
|
||||
PROP_ORIENTATION = 1 << 1,
|
||||
PROP_TOUCH = 1 << 2,
|
||||
@@ -79,84 +50,17 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens
|
||||
PROP_DAMAGE = 1 << 4,
|
||||
PROP_CONTROL = 1 << 5;
|
||||
|
||||
private static final int[] props = new int[SUBTYPES];
|
||||
private static final Lens[] lenses = new Lens[SUBTYPES];
|
||||
private static final Lens fallbackLens = new Lens();
|
||||
private static final Lens stormLens = new LensStorm();
|
||||
|
||||
static {
|
||||
setProps(NORMAL, PROP_NONE);
|
||||
setProps(SPEED, PROP_NONE);
|
||||
setProps(POWER, PROP_POWER);
|
||||
setProps(TIME, PROP_NONE);
|
||||
setProps(EFFICIENCY, PROP_NONE);
|
||||
setProps(BOUNCE, PROP_TOUCH);
|
||||
setProps(GRAVITY, PROP_ORIENTATION);
|
||||
setProps(MINE, PROP_TOUCH | PROP_INTERACTION);
|
||||
setProps(DAMAGE, PROP_DAMAGE);
|
||||
setProps(PHANTOM, PROP_TOUCH);
|
||||
setProps(MAGNET, PROP_ORIENTATION);
|
||||
setProps(EXPLOSIVE, PROP_DAMAGE | PROP_TOUCH | PROP_INTERACTION);
|
||||
setProps(INFLUENCE, PROP_NONE);
|
||||
setProps(WEIGHT, PROP_TOUCH | PROP_INTERACTION);
|
||||
setProps(PAINT, PROP_TOUCH | PROP_INTERACTION);
|
||||
setProps(FIRE, PROP_DAMAGE | PROP_TOUCH | PROP_INTERACTION);
|
||||
setProps(PISTON, PROP_TOUCH | PROP_INTERACTION);
|
||||
setProps(LIGHT, PROP_TOUCH | PROP_INTERACTION);
|
||||
setProps(WARP, PROP_NONE);
|
||||
setProps(REDIRECT, PROP_TOUCH | PROP_INTERACTION);
|
||||
setProps(FIREWORK, PROP_TOUCH);
|
||||
setProps(FLARE, PROP_CONTROL);
|
||||
setProps(MESSENGER, PROP_POWER);
|
||||
setProps(TRIPWIRE, PROP_CONTROL);
|
||||
|
||||
setLens(NORMAL, fallbackLens);
|
||||
setLens(SPEED, new LensSpeed());
|
||||
setLens(POWER, new LensPower());
|
||||
setLens(TIME, new LensTime());
|
||||
setLens(EFFICIENCY, new LensEfficiency());
|
||||
setLens(BOUNCE, new LensBounce());
|
||||
setLens(GRAVITY, new LensGravity());
|
||||
setLens(MINE, new LensMine());
|
||||
setLens(DAMAGE, new LensDamage());
|
||||
setLens(PHANTOM, new LensPhantom());
|
||||
setLens(MAGNET, new LensMagnet());
|
||||
setLens(EXPLOSIVE, new LensExplosive());
|
||||
setLens(INFLUENCE, new LensInfluence());
|
||||
setLens(WEIGHT, new LensWeight());
|
||||
setLens(PAINT, new LensPaint());
|
||||
setLens(FIRE, new LensFire());
|
||||
setLens(PISTON, new LensPiston());
|
||||
setLens(LIGHT, new LensLight());
|
||||
setLens(WARP, new LensWarp());
|
||||
setLens(REDIRECT, new LensRedirect());
|
||||
setLens(FIREWORK, new LensFirework());
|
||||
setLens(FLARE, new LensFlare());
|
||||
setLens(MESSENGER, new LensMessenger());
|
||||
setLens(TRIPWIRE, new LensTripwire());
|
||||
}
|
||||
|
||||
private static final String TAG_COLOR = "color";
|
||||
private static final String TAG_COMPOSITE_LENS = "compositeLens";
|
||||
|
||||
public ItemLens() {
|
||||
super(LibItemNames.LENS);
|
||||
private final Lens lens;
|
||||
private final int props;
|
||||
|
||||
public ItemLens(String name, Lens lens, int props) {
|
||||
super(name);
|
||||
setMaxStackSize(1);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> stacks) {
|
||||
if(isInCreativeTab(tab)) {
|
||||
for(int i = 0; i < SUBTYPES; i++)
|
||||
stacks.add(new ItemStack(this, 1, i));
|
||||
}
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public String getUnlocalizedName(ItemStack par1ItemStack) {
|
||||
return "item." + LibItemNames.LENS_NAMES[Math.min(SUBTYPES - 1, par1ItemStack.getItemDamage())];
|
||||
this.lens = lens;
|
||||
this.props = props;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@@ -187,7 +91,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens
|
||||
if(storedColor != -1)
|
||||
props.color = getLensColor(stack);
|
||||
|
||||
getLens(stack.getItemDamage()).apply(stack, props);
|
||||
getLens(stack).apply(stack, props);
|
||||
|
||||
ItemStack compositeLens = getCompositeLens(stack);
|
||||
if(!compositeLens.isEmpty() && compositeLens.getItem() instanceof ILens)
|
||||
@@ -198,7 +102,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens
|
||||
public boolean collideBurst(IManaBurst burst, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) {
|
||||
EntityThrowable entity = (EntityThrowable) burst;
|
||||
|
||||
dead = getLens(stack.getItemDamage()).collideBurst(burst, entity, pos, isManaBlock, dead, stack);
|
||||
dead = getLens(stack).collideBurst(burst, entity, pos, isManaBlock, dead, stack);
|
||||
|
||||
ItemStack compositeLens = getCompositeLens(stack);
|
||||
if(!compositeLens.isEmpty() && compositeLens.getItem() instanceof ILens)
|
||||
@@ -215,7 +119,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens
|
||||
if(storedColor == 16 && entity.world.isRemote)
|
||||
burst.setColor(getLensColor(stack));
|
||||
|
||||
getLens(stack.getItemDamage()).updateBurst(burst, entity, stack);
|
||||
getLens(stack).updateBurst(burst, entity, stack);
|
||||
|
||||
ItemStack compositeLens = getCompositeLens(stack);
|
||||
if(!compositeLens.isEmpty() && compositeLens.getItem() instanceof ILens)
|
||||
@@ -248,29 +152,16 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens
|
||||
return true;
|
||||
}
|
||||
|
||||
public static void setProps(int lens, int props_) {
|
||||
props[lens] = props_;
|
||||
}
|
||||
|
||||
public static void setLens(int index, Lens lens) {
|
||||
lenses[index] = lens;
|
||||
}
|
||||
|
||||
public static boolean isBlacklisted(ItemStack lens1, ItemStack lens2) {
|
||||
ICompositableLens item1 = (ICompositableLens) lens1.getItem();
|
||||
ICompositableLens item2 = (ICompositableLens) lens2.getItem();
|
||||
return (item1.getProps(lens1) & item2.getProps(lens2)) != 0;
|
||||
}
|
||||
|
||||
public static Lens getLens(int index) {
|
||||
if(index == STORM)
|
||||
return stormLens;
|
||||
|
||||
if(index < 0 || index >= lenses.length)
|
||||
return fallbackLens;
|
||||
|
||||
Lens lens = lenses[index];
|
||||
return lens == null ? fallbackLens : lens;
|
||||
public static Lens getLens(ItemStack stack) {
|
||||
if(stack.getItem() instanceof ItemLens)
|
||||
return ((ItemLens) stack.getItem()).lens;
|
||||
else return new Lens();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -308,12 +199,12 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens
|
||||
|
||||
@Override
|
||||
public int getManaToTransfer(IManaBurst burst, EntityThrowable entity, ItemStack stack, IManaReceiver receiver) {
|
||||
return getLens(stack.getItemDamage()).getManaToTransfer(burst, entity, stack, receiver);
|
||||
return getLens(stack).getManaToTransfer(burst, entity, stack, receiver);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldPull(ItemStack stack) {
|
||||
return stack.getItemDamage() != STORM;
|
||||
return stack.getItem() != ModItems.lensStorm;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -323,33 +214,27 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens
|
||||
|
||||
@Override
|
||||
public boolean allowBurstShooting(ItemStack stack, IManaSpreader spreader, boolean redstone) {
|
||||
return getLens(stack.getItemDamage()).allowBurstShooting(stack, spreader, redstone);
|
||||
return getLens(stack).allowBurstShooting(stack, spreader, redstone);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onControlledSpreaderTick(ItemStack stack, IManaSpreader spreader, boolean redstone) {
|
||||
getLens(stack.getItemDamage()).onControlledSpreaderTick(stack, spreader, redstone);
|
||||
getLens(stack).onControlledSpreaderTick(stack, spreader, redstone);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onControlledSpreaderPulse(ItemStack stack, IManaSpreader spreader, boolean redstone) {
|
||||
getLens(stack.getItemDamage()).onControlledSpreaderPulse(stack, spreader, redstone);
|
||||
getLens(stack).onControlledSpreaderPulse(stack, spreader, redstone);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getProps(ItemStack stack) {
|
||||
return props[stack.getItemDamage()];
|
||||
return props;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isCombinable(ItemStack stack) {
|
||||
return stack.getItemDamage() != NORMAL;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerModels() {
|
||||
ModelHandler.registerItemMetas(this, LibItemNames.LENS_NAMES.length, i -> LibItemNames.LENS_NAMES[i]);
|
||||
return stack.getItem() != ModItems.lensNormal;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -43,7 +43,7 @@ public class LensInfluence extends Lens {
|
||||
if(movable instanceof IManaBurst) {
|
||||
IManaBurst otherBurst = (IManaBurst) movable;
|
||||
ItemStack lens = otherBurst.getSourceLens();
|
||||
if(lens != null && lens.getItem() == ModItems.lens && lens.getItemDamage() == ItemLens.INFLUENCE)
|
||||
if(!lens.isEmpty() && lens.getItem() == ModItems.lensInfluence)
|
||||
continue;
|
||||
|
||||
((IManaBurst) movable).setMotion(entity.motionX, entity.motionY, entity.motionZ);
|
||||
|
||||
@@ -42,8 +42,8 @@ public class LensMine extends Lens {
|
||||
|
||||
Block block = world.getBlockState(pos_).getBlock();
|
||||
|
||||
ItemStack composite = ((ItemLens) ModItems.lens).getCompositeLens(stack);
|
||||
boolean warp = composite != null && composite.getItem() == ModItems.lens && composite.getItemDamage() == ItemLens.WARP;
|
||||
ItemStack composite = ((ItemLens) stack.getItem()).getCompositeLens(stack);
|
||||
boolean warp = !composite.isEmpty() && composite.getItem() == ModItems.lensWarp;
|
||||
|
||||
if(warp && (block == ModBlocks.pistonRelay || block == Blocks.PISTON || block == Blocks.PISTON_EXTENSION || block == Blocks.PISTON_HEAD))
|
||||
return false;
|
||||
|
||||
@@ -17,7 +17,6 @@ public final class LibItemNames {
|
||||
public static final String DYE = "dye";
|
||||
public static final String PESTLE_AND_MORTAR = "pestleAndMortar";
|
||||
public static final String TWIG_WAND = "twigWand";
|
||||
public static final String LENS = "lens";
|
||||
public static final String RUNE = "rune";
|
||||
public static final String MANA_TABLET = "manaTablet";
|
||||
public static final String MANA_GUN = "manaGun";
|
||||
@@ -176,30 +175,31 @@ public final class LibItemNames {
|
||||
public static final String GODDESS_CHARM = "goddessCharm";
|
||||
|
||||
public static final String[] LENS_NAMES = new String[] {
|
||||
"lensNormal",
|
||||
"lensSpeed",
|
||||
"lensPower",
|
||||
"lensTime",
|
||||
"lensEfficiency",
|
||||
"lensBounce",
|
||||
"lensGravity",
|
||||
"lensMine",
|
||||
"lensDamage",
|
||||
"lensPhantom",
|
||||
"lensMagnet",
|
||||
"lensExplosive",
|
||||
"lensInfluence",
|
||||
"lensWeight",
|
||||
"lensPaint",
|
||||
"lensFire",
|
||||
"lensPiston",
|
||||
"lensLight",
|
||||
"lensWarp",
|
||||
"lensRedirect",
|
||||
"lensFirework",
|
||||
"lensFlare",
|
||||
"lensMessenger",
|
||||
"lensTripwire"
|
||||
"lens_normal",
|
||||
"lens_speed",
|
||||
"lens_power",
|
||||
"lens_time",
|
||||
"lens_efficiency",
|
||||
"lens_bounce",
|
||||
"lens_gravity",
|
||||
"lens_mine",
|
||||
"lens_damage",
|
||||
"lens_phantom",
|
||||
"lens_magnet",
|
||||
"lens_explosive",
|
||||
"lens_influence",
|
||||
"lens_weight",
|
||||
"lens_paint",
|
||||
"lens_fire",
|
||||
"lens_piston",
|
||||
"lens_light",
|
||||
"lens_warp",
|
||||
"lens_redirect",
|
||||
"lens_firework",
|
||||
"lens_flare",
|
||||
"lens_messenger",
|
||||
"lens_tripwire",
|
||||
"lens_storm"
|
||||
};
|
||||
|
||||
public static final String[] MANA_RESOURCE_NAMES = new String[] {
|
||||
|
||||
Reference in new issue
Block a user