generated from tilera/1710mod
chore: format code
This commit is contained in:
parent
1e3213799a
commit
a539810fe6
15 changed files with 237 additions and 135 deletions
|
@ -246,7 +246,9 @@ public class GuiTicker {
|
|||
int maxVis = ((TileCrystalCapacitor) te).maxVis;
|
||||
|
||||
String top_s = storedVis + " Vis";
|
||||
String bot_s = Math.round(maxVis == 0 ? 0 : ((float)storedVis / (float)maxVis) * 100.0) + "%";
|
||||
String bot_s
|
||||
= Math.round(maxVis == 0 ? 0 : ((float) storedVis / (float) maxVis) * 100.0)
|
||||
+ "%";
|
||||
|
||||
int textwidth = Math.max(
|
||||
mc.fontRenderer.getStringWidth(top_s), mc.fontRenderer.getStringWidth(bot_s)
|
||||
|
|
|
@ -10,11 +10,43 @@ import thaumcraft.api.aspects.AspectList;
|
|||
import thaumcraft.common.config.ConfigBlocks;
|
||||
|
||||
public class Recipes {
|
||||
|
||||
public static void init() {
|
||||
Research.arcaneRecipes.put("ArcaneStone", ThaumcraftApi.addArcaneCraftingRecipe("MAGBLOCKS", new ItemStack(CCBlocks.infusionWorkbench, 8), new AspectList().add(Aspects.VIS, 20), "TST", "SSS", "TST", 'S', "stone", 'T', "ingotThaumium"));
|
||||
Research.arcaneRecipes.put(
|
||||
"ArcaneStone",
|
||||
ThaumcraftApi.addArcaneCraftingRecipe(
|
||||
"MAGBLOCKS",
|
||||
new ItemStack(CCBlocks.infusionWorkbench, 8),
|
||||
new AspectList().add(Aspects.VIS, 20),
|
||||
"TST",
|
||||
"SSS",
|
||||
"TST",
|
||||
'S',
|
||||
"stone",
|
||||
'T',
|
||||
"ingotThaumium"
|
||||
)
|
||||
);
|
||||
|
||||
Research.infusionRecipes.put("CrystalCore", AuracoreRecipes.addInfusionCraftingRecipe("CRYSTALCORE", "CRYSTALCORE", 50, new AspectList().add(Aspect.VOID, 8).add(Aspect.MAGIC, 8).add(Aspects.FLUX, 8).add(Aspect.ELDRITCH, 8), new ItemStack(CCBlocks.crystal, 1), new Object[]{" C ", "CNC", " C ", Character.valueOf('C'), new ItemStack(ConfigBlocks.blockCrystal, 1, 9), Character.valueOf('N'), Items.nether_star}));
|
||||
Research.infusionRecipes.put(
|
||||
"CrystalCore",
|
||||
AuracoreRecipes.addInfusionCraftingRecipe(
|
||||
"CRYSTALCORE",
|
||||
"CRYSTALCORE",
|
||||
50,
|
||||
new AspectList()
|
||||
.add(Aspect.VOID, 8)
|
||||
.add(Aspect.MAGIC, 8)
|
||||
.add(Aspects.FLUX, 8)
|
||||
.add(Aspect.ELDRITCH, 8),
|
||||
new ItemStack(CCBlocks.crystal, 1),
|
||||
new Object[] { " C ",
|
||||
"CNC",
|
||||
" C ",
|
||||
Character.valueOf('C'),
|
||||
new ItemStack(ConfigBlocks.blockCrystal, 1, 9),
|
||||
Character.valueOf('N'),
|
||||
Items.nether_star }
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -19,36 +19,107 @@ import thaumcraft.api.research.ResearchPage;
|
|||
import thaumcraft.common.config.ConfigBlocks;
|
||||
|
||||
public class Research {
|
||||
|
||||
public static List<Object> infusionStructure;
|
||||
public static List<Object> magnetStructure;
|
||||
public static Map<String, IArcaneRecipe> arcaneRecipes = new HashMap<>();
|
||||
public static Map<String, IInfusionRecipe> infusionRecipes = new HashMap<>();
|
||||
public static ItemStack empty = new ItemStack(ConfigBlocks.blockHole, 1, 15);
|
||||
|
||||
|
||||
public static void init() {
|
||||
infusionStructure = Arrays.asList(
|
||||
new AspectList().add(Aspects.VIS, 20),
|
||||
2,
|
||||
1,
|
||||
2,
|
||||
Arrays.asList(
|
||||
new ItemStack(CCBlocks.infusionWorkbench),
|
||||
new ItemStack(CCBlocks.infusionWorkbench),
|
||||
new ItemStack(CCBlocks.infusionWorkbench),
|
||||
new ItemStack(CCBlocks.infusionWorkbench)
|
||||
)
|
||||
);
|
||||
magnetStructure = Arrays.asList(
|
||||
new AspectList().add(Aspects.VIS, 300),
|
||||
3,
|
||||
3,
|
||||
3,
|
||||
Arrays.asList(
|
||||
empty,
|
||||
empty,
|
||||
empty,
|
||||
empty,
|
||||
new ItemStack(CCBlocks.crystal),
|
||||
empty,
|
||||
empty,
|
||||
empty,
|
||||
empty,
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0),
|
||||
empty,
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0),
|
||||
empty,
|
||||
empty,
|
||||
empty,
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0),
|
||||
empty,
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0),
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0),
|
||||
empty,
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0),
|
||||
empty,
|
||||
empty,
|
||||
empty,
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0),
|
||||
empty,
|
||||
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0)
|
||||
)
|
||||
);
|
||||
|
||||
infusionStructure = Arrays.asList(new AspectList().add(Aspects.VIS, 20), 2, 1, 2, Arrays.asList(new ItemStack(CCBlocks.infusionWorkbench), new ItemStack(CCBlocks.infusionWorkbench), new ItemStack(CCBlocks.infusionWorkbench), new ItemStack(CCBlocks.infusionWorkbench)));
|
||||
magnetStructure = Arrays.asList(new AspectList().add(Aspects.VIS, 300), 3, 3, 3, Arrays.asList(empty, empty, empty, empty, new ItemStack(CCBlocks.crystal), empty, empty, empty, empty, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0), empty, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0), empty, empty, empty, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0), empty, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0), empty, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0), empty, empty, empty, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0), empty, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 0)));
|
||||
|
||||
ResearchCategories.registerCategory("CLASSICCASTING", new ResourceLocation("classiccasting", "textures/items/wandapprentice.png"), new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png"));
|
||||
ResearchCategories.registerCategory(
|
||||
"CLASSICCASTING",
|
||||
new ResourceLocation("classiccasting", "textures/items/wandapprentice.png"),
|
||||
new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png")
|
||||
);
|
||||
|
||||
// TODO: move research to right place
|
||||
new ResearchItem("MAGBLOCKS", "CLASSICCASTING", new AspectList().add(Aspects.ROCK, 1).add(Aspect.METAL, 1).add(Aspect.MAGIC, 1).add(Aspect.TREE, 1).add(Aspect.CRAFT, 1), 0, 0, 2, new ItemStack(CCBlocks.infusionWorkbench)).setPages(
|
||||
new ResearchPage("classiccasting.research_page.MAGBLOCKS.1"),
|
||||
new ResearchPage(arcaneRecipes.get("ArcaneStone")),
|
||||
new ResearchPage("classiccasting.research_page.MAGBLOCKS.2"),
|
||||
new ResearchPage(infusionStructure),
|
||||
new ResearchPage("classiccasting.research_page.MAGBLOCKS.3")
|
||||
).setParents("THAUMIUM").registerResearchItem();
|
||||
|
||||
new ResearchItem("CRYSTALCORE", "CLASSICCASTING", new AspectList(), 0, 2, 3, new ItemStack(CCBlocks.crystal)).setPages(
|
||||
new ResearchPage("classiccasting.research_page.CRYSTALCORE.1"),
|
||||
new ResearchPageInfusion(infusionRecipes.get("CrystalCore")),
|
||||
new ResearchPage("classiccasting.research_page.CRYSTALCORE.2"),
|
||||
new ResearchPage(magnetStructure)
|
||||
).registerResearchItem();
|
||||
new ResearchItem(
|
||||
"MAGBLOCKS",
|
||||
"CLASSICCASTING",
|
||||
new AspectList()
|
||||
.add(Aspects.ROCK, 1)
|
||||
.add(Aspect.METAL, 1)
|
||||
.add(Aspect.MAGIC, 1)
|
||||
.add(Aspect.TREE, 1)
|
||||
.add(Aspect.CRAFT, 1),
|
||||
0,
|
||||
0,
|
||||
2,
|
||||
new ItemStack(CCBlocks.infusionWorkbench)
|
||||
)
|
||||
.setPages(
|
||||
new ResearchPage("classiccasting.research_page.MAGBLOCKS.1"),
|
||||
new ResearchPage(arcaneRecipes.get("ArcaneStone")),
|
||||
new ResearchPage("classiccasting.research_page.MAGBLOCKS.2"),
|
||||
new ResearchPage(infusionStructure),
|
||||
new ResearchPage("classiccasting.research_page.MAGBLOCKS.3")
|
||||
)
|
||||
.setParents("THAUMIUM")
|
||||
.registerResearchItem();
|
||||
|
||||
new ResearchItem(
|
||||
"CRYSTALCORE",
|
||||
"CLASSICCASTING",
|
||||
new AspectList(),
|
||||
0,
|
||||
2,
|
||||
3,
|
||||
new ItemStack(CCBlocks.crystal)
|
||||
)
|
||||
.setPages(
|
||||
new ResearchPage("classiccasting.research_page.CRYSTALCORE.1"),
|
||||
new ResearchPageInfusion(infusionRecipes.get("CrystalCore")),
|
||||
new ResearchPage("classiccasting.research_page.CRYSTALCORE.2"),
|
||||
new ResearchPage(magnetStructure)
|
||||
)
|
||||
.registerResearchItem();
|
||||
}
|
||||
|
||||
}
|
|
@ -150,8 +150,9 @@ public class Utils {
|
|||
return pointedEntity;
|
||||
}
|
||||
|
||||
public static MovingObjectPosition
|
||||
getTargetBlock(final World world, final EntityPlayer player, final boolean par3, float range) {
|
||||
public static MovingObjectPosition getTargetBlock(
|
||||
final World world, final EntityPlayer player, final boolean par3, float range
|
||||
) {
|
||||
final float var4 = 1.0f;
|
||||
final float var5 = ((Entity) player).prevRotationPitch
|
||||
+ (((Entity) player).rotationPitch - ((Entity) player).prevRotationPitch)
|
||||
|
|
|
@ -116,18 +116,10 @@ public class UtilsFX {
|
|||
tes.startDrawingQuads();
|
||||
tes.setBrightness(brightness);
|
||||
tes.setNormal(0.0F, 0.0F, 1.0F);
|
||||
tes.addVertexWithUV(
|
||||
0.0D, 0.0D, 0.0D, (double) p_78439_1_, (double) p_78439_4_
|
||||
);
|
||||
tes.addVertexWithUV(
|
||||
1.0D, 0.0D, 0.0D, (double) p_78439_3_, (double) p_78439_4_
|
||||
);
|
||||
tes.addVertexWithUV(
|
||||
1.0D, 1.0D, 0.0D, (double) p_78439_3_, (double) p_78439_2_
|
||||
);
|
||||
tes.addVertexWithUV(
|
||||
0.0D, 1.0D, 0.0D, (double) p_78439_1_, (double) p_78439_2_
|
||||
);
|
||||
tes.addVertexWithUV(0.0D, 0.0D, 0.0D, (double) p_78439_1_, (double) p_78439_4_);
|
||||
tes.addVertexWithUV(1.0D, 0.0D, 0.0D, (double) p_78439_3_, (double) p_78439_4_);
|
||||
tes.addVertexWithUV(1.0D, 1.0D, 0.0D, (double) p_78439_3_, (double) p_78439_2_);
|
||||
tes.addVertexWithUV(0.0D, 1.0D, 0.0D, (double) p_78439_1_, (double) p_78439_2_);
|
||||
tes.draw();
|
||||
tes.startDrawingQuads();
|
||||
tes.setBrightness(brightness);
|
||||
|
|
|
@ -80,25 +80,31 @@ public class ContainerInfusionWorkbench extends Container {
|
|||
ic, this.tileEntity.getWorldObj()
|
||||
)
|
||||
);
|
||||
TileMagicWorkbench bridge = AuracoreCraftingManager.createBridgeInventory(this.tileEntity, 0, 9);
|
||||
TileMagicWorkbench bridge
|
||||
= AuracoreCraftingManager.createBridgeInventory(this.tileEntity, 0, 9);
|
||||
if (this.tileEntity.getStackInSlot(9) == null
|
||||
&& this.tileEntity.getStackInSlot(10) != null
|
||||
&& this.tileEntity.getStackInSlot(10).getItem() instanceof IWand) {
|
||||
IArcaneRecipe recipe = AuracoreCraftingManager.findMatchingArcaneRecipe(bridge, this.ip.player);
|
||||
if (recipe != null && WandManager.hasCharge(this.tileEntity.getStackInSlot(10), this.ip.player, AuracoreCraftingManager.getArcaneRecipeVisCost(recipe, bridge))) {
|
||||
this.tileEntity.setInventorySlotContentsSoftly(
|
||||
9,
|
||||
recipe.getCraftingResult(bridge)
|
||||
);
|
||||
}
|
||||
IArcaneRecipe recipe = AuracoreCraftingManager.findMatchingArcaneRecipe(
|
||||
bridge, this.ip.player
|
||||
);
|
||||
if (recipe != null
|
||||
&& WandManager.hasCharge(
|
||||
this.tileEntity.getStackInSlot(10),
|
||||
this.ip.player,
|
||||
AuracoreCraftingManager.getArcaneRecipeVisCost(recipe, bridge)
|
||||
)) {
|
||||
this.tileEntity.setInventorySlotContentsSoftly(
|
||||
9, recipe.getCraftingResult(bridge)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (this.tileEntity.getStackInSlot(9) == null
|
||||
&& this.tileEntity.getStackInSlot(10) != null) {
|
||||
IInfusionRecipe rec
|
||||
= AuracoreCraftingManager.findMatchingInfusionRecipe(
|
||||
bridge, this.ip.player
|
||||
);
|
||||
IInfusionRecipe rec = AuracoreCraftingManager.findMatchingInfusionRecipe(
|
||||
bridge, this.ip.player
|
||||
);
|
||||
|
||||
if (rec != null
|
||||
&& WandManager.hasCharge(
|
||||
|
|
|
@ -42,30 +42,34 @@ public class SlotCraftingInfusionWorkbench extends SlotCrafting {
|
|||
);
|
||||
this.onCrafting(par1ItemStack);
|
||||
int cost;
|
||||
TileMagicWorkbench bridge = AuracoreCraftingManager.createBridgeInventory(this.craftMatrix, 0, 9);
|
||||
IArcaneRecipe recipe = AuracoreCraftingManager.findMatchingArcaneRecipe(bridge, this.thePlayer);
|
||||
TileMagicWorkbench bridge
|
||||
= AuracoreCraftingManager.createBridgeInventory(this.craftMatrix, 0, 9);
|
||||
IArcaneRecipe recipe
|
||||
= AuracoreCraftingManager.findMatchingArcaneRecipe(bridge, this.thePlayer);
|
||||
cost = AuracoreCraftingManager.getArcaneRecipeVisCost(recipe, bridge);
|
||||
if (cost == 0) {
|
||||
IInfusionRecipe rec = AuracoreCraftingManager.findMatchingInfusionRecipe(
|
||||
bridge, this.thePlayer
|
||||
);
|
||||
if (rec != null) {
|
||||
cost = rec.getCost();
|
||||
final AspectList tags = rec.getAspects();
|
||||
if (tags != null && tags.size() > 0) {
|
||||
final TileInfusionWorkbench tiwb
|
||||
= (TileInfusionWorkbench) this.craftMatrix;
|
||||
for (final Aspect tag : tags.getAspects()) {
|
||||
final IAspectSource as = tiwb.foundAspects.getSource(tag);
|
||||
if (as != null) {
|
||||
as.takeFromContainer(tag, tags.getAmount(tag));
|
||||
IInfusionRecipe rec = AuracoreCraftingManager.findMatchingInfusionRecipe(
|
||||
bridge, this.thePlayer
|
||||
);
|
||||
if (rec != null) {
|
||||
cost = rec.getCost();
|
||||
final AspectList tags = rec.getAspects();
|
||||
if (tags != null && tags.size() > 0) {
|
||||
final TileInfusionWorkbench tiwb
|
||||
= (TileInfusionWorkbench) this.craftMatrix;
|
||||
for (final Aspect tag : tags.getAspects()) {
|
||||
final IAspectSource as = tiwb.foundAspects.getSource(tag);
|
||||
if (as != null) {
|
||||
as.takeFromContainer(tag, tags.getAmount(tag));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (cost > 0) {
|
||||
WandManager.spendCharge(this.craftMatrix.getStackInSlot(10), par1EntityPlayer, cost);
|
||||
WandManager.spendCharge(
|
||||
this.craftMatrix.getStackInSlot(10), par1EntityPlayer, cost
|
||||
);
|
||||
}
|
||||
for (int var2 = 0; var2 < 9; ++var2) {
|
||||
final ItemStack var3 = this.craftMatrix.getStackInSlot(var2);
|
||||
|
|
|
@ -358,7 +358,8 @@ public class EntityFrostShard extends Entity implements IProjectile {
|
|||
}
|
||||
if (var8.entityHit.attackEntityFrom(var20, var19)) {
|
||||
if (var8.entityHit instanceof EntityLivingBase) {
|
||||
final EntityLivingBase var21 = (EntityLivingBase) var8.entityHit;
|
||||
final EntityLivingBase var21
|
||||
= (EntityLivingBase) var8.entityHit;
|
||||
if (this.knockbackStrength > 0) {
|
||||
final float var22 = MathHelper.sqrt_double(
|
||||
super.motionX * super.motionX
|
||||
|
|
|
@ -87,45 +87,50 @@ public class GuiInfusionWorkbench extends GuiContainer {
|
|||
this.drawTexturedModalRect(var5, var6, 0, 0, this.xSize, this.ySize);
|
||||
GL11.glDisable(3042);
|
||||
ItemStack result = null;
|
||||
TileMagicWorkbench bridge = AuracoreCraftingManager.createBridgeInventory(this.tileEntity, 0, 9);
|
||||
IArcaneRecipe arcaneRecipe = AuracoreCraftingManager.findMatchingArcaneRecipe(bridge, this.ip.player);
|
||||
TileMagicWorkbench bridge
|
||||
= AuracoreCraftingManager.createBridgeInventory(this.tileEntity, 0, 9);
|
||||
IArcaneRecipe arcaneRecipe
|
||||
= AuracoreCraftingManager.findMatchingArcaneRecipe(bridge, this.ip.player);
|
||||
IInfusionRecipe rec = null;
|
||||
if (arcaneRecipe != null) {
|
||||
result = arcaneRecipe.getCraftingResult(bridge);
|
||||
} else {
|
||||
rec = AuracoreCraftingManager.findMatchingInfusionRecipe(
|
||||
bridge, this.ip.player
|
||||
);
|
||||
if (rec != null) {
|
||||
result = rec.getRecipeOutput();
|
||||
final AspectList reqs = rec.getAspects();
|
||||
int count = 0;
|
||||
if (reqs != null && reqs.size() > 0) {
|
||||
for (final Aspect tag : reqs.getAspects()) {
|
||||
float op = 1.0f;
|
||||
if (this.tileEntity.foundAspects.getAmount(tag)
|
||||
< reqs.getAmount(tag)) {
|
||||
op = (float
|
||||
) (MathHelper.sin(this.ip.player.ticksExisted - count * 10)
|
||||
/ 8.0f)
|
||||
* 0.125f
|
||||
+ 0.25f;
|
||||
rec = AuracoreCraftingManager.findMatchingInfusionRecipe(
|
||||
bridge, this.ip.player
|
||||
);
|
||||
if (rec != null) {
|
||||
result = rec.getRecipeOutput();
|
||||
final AspectList reqs = rec.getAspects();
|
||||
int count = 0;
|
||||
if (reqs != null && reqs.size() > 0) {
|
||||
for (final Aspect tag : reqs.getAspects()) {
|
||||
float op = 1.0f;
|
||||
if (this.tileEntity.foundAspects.getAmount(tag)
|
||||
< reqs.getAmount(tag)) {
|
||||
op = (float
|
||||
) (MathHelper.sin(
|
||||
this.ip.player.ticksExisted - count * 10
|
||||
)
|
||||
/ 8.0f)
|
||||
* 0.125f
|
||||
+ 0.25f;
|
||||
}
|
||||
UtilsFX.drawTag(
|
||||
var5 + 24 + 16 * count + (5 - reqs.size()) * 8,
|
||||
var6 + 72,
|
||||
tag,
|
||||
reqs.getAmount(tag),
|
||||
0,
|
||||
op
|
||||
);
|
||||
++count;
|
||||
}
|
||||
UtilsFX.drawTag(
|
||||
var5 + 24 + 16 * count + (5 - reqs.size()) * 8,
|
||||
var6 + 72,
|
||||
tag,
|
||||
reqs.getAmount(tag),
|
||||
0,
|
||||
op
|
||||
);
|
||||
++count;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (this.tileEntity.getStackInSlot(10) != null) {
|
||||
final int charge = ((IWand)this.tileEntity.getStackInSlot(10).getItem()).getVis(this.tileEntity.getStackInSlot(10));
|
||||
final int charge = ((IWand) this.tileEntity.getStackInSlot(10).getItem())
|
||||
.getVis(this.tileEntity.getStackInSlot(10));
|
||||
if (charge > 0) {
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslatef((float) (var5 + 140), (float) (var6 + 85), 505.0f);
|
||||
|
@ -139,7 +144,9 @@ public class GuiInfusionWorkbench extends GuiContainer {
|
|||
if (result != null) {
|
||||
final int discount
|
||||
= 100 - Math.min(50, WandManager.getTotalVisDiscount(this.ip.player));
|
||||
int cost1 = arcaneRecipe != null ? AuracoreCraftingManager.getArcaneRecipeVisCost(arcaneRecipe, bridge) : 0;
|
||||
int cost1 = arcaneRecipe != null
|
||||
? AuracoreCraftingManager.getArcaneRecipeVisCost(arcaneRecipe, bridge)
|
||||
: 0;
|
||||
cost1 = Math.round(cost1 * (discount / 100.0f));
|
||||
int cost2 = rec != null ? rec.getCost() : 0;
|
||||
cost2 = Math.round(cost2 * (discount / 100.0f));
|
||||
|
@ -172,11 +179,9 @@ public class GuiInfusionWorkbench extends GuiContainer {
|
|||
GL11.glTranslatef((float) (var5 + 140), (float) (var6 + 85), 0.0f);
|
||||
GL11.glScalef(0.5f, 0.5f, 0.0f);
|
||||
String text2 = "Insufficient charge";
|
||||
if (cost1 > ((IWand) this.tileEntity.getStackInSlot(10)
|
||||
.getItem())
|
||||
if (cost1 > ((IWand) this.tileEntity.getStackInSlot(10).getItem())
|
||||
.getMaxVis(this.tileEntity.getStackInSlot(10))
|
||||
|| cost2 > ((IWand) this.tileEntity.getStackInSlot(10)
|
||||
.getItem())
|
||||
|| cost2 > ((IWand) this.tileEntity.getStackInSlot(10).getItem())
|
||||
.getMaxVis(this.tileEntity.getStackInSlot(10))) {
|
||||
text2 = "This wand is too weak";
|
||||
}
|
||||
|
|
|
@ -99,12 +99,7 @@ public class ItemBlockAlembic extends ItemBlock {
|
|||
);
|
||||
--stack.stackSize;
|
||||
world.setBlock(
|
||||
x,
|
||||
y,
|
||||
z,
|
||||
CCBlocks.alembic,
|
||||
dir.getOpposite().ordinal() - 2,
|
||||
3
|
||||
x, y, z, CCBlocks.alembic, dir.getOpposite().ordinal() - 2, 3
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -309,8 +309,7 @@ public abstract class ItemWandCasting extends Item implements IWand {
|
|||
if ((bi == ConfigBlocks.blockCosmeticSolid || bi == CCBlocks.crystal)
|
||||
&& ResearchManager.isResearchComplete(
|
||||
player.getDisplayName(), "CRYSTALCORE"
|
||||
)
|
||||
) {
|
||||
)) {
|
||||
result = WandManager.createNodeMagnet(itemstack, player, world, x, y, z);
|
||||
}
|
||||
|
||||
|
@ -364,16 +363,15 @@ public abstract class ItemWandCasting extends Item implements IWand {
|
|||
tile2.spillRemnants();
|
||||
return true;
|
||||
}
|
||||
CrucibleRecipe recipe = AuracoreRecipes.getCrucibleRecipe(tile2.aspects, tile2);
|
||||
CrucibleRecipe recipe
|
||||
= AuracoreRecipes.getCrucibleRecipe(tile2.aspects, tile2);
|
||||
if (WandManager.spendCharge(
|
||||
world,
|
||||
itemstack,
|
||||
player,
|
||||
AuracoreRecipes.getCrucibleOutputCost(tile2, recipe)
|
||||
)) {
|
||||
AuracoreCraftingManager.performCrucibleCrafting(
|
||||
player, tile2
|
||||
);
|
||||
AuracoreCraftingManager.performCrucibleCrafting(player, tile2);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,45 +1,44 @@
|
|||
package net.anvilcraft.classiccasting.items.wands;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class ItemWandCastingApprentice extends ItemWandCasting
|
||||
{
|
||||
public class ItemWandCastingApprentice extends ItemWandCasting {
|
||||
public IIcon icon;
|
||||
|
||||
|
||||
public ItemWandCastingApprentice() {
|
||||
super();
|
||||
super.maxStackSize = 1;
|
||||
super.canRepair = false;
|
||||
this.setUnlocalizedName("classiccasting:wandCastingApprentice");
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(final IIconRegister ir) {
|
||||
this.icon = ir.registerIcon("classiccasting:wandapprentice");
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon getIconFromDamage(final int par1) {
|
||||
return this.icon;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public int getMaxVis(ItemStack i) {
|
||||
return 50;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public EnumRarity getRarity(final ItemStack itemstack) {
|
||||
return EnumRarity.uncommon;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public int getRechargeInterval() {
|
||||
return 10;
|
||||
|
|
|
@ -3,6 +3,7 @@ package net.anvilcraft.classiccasting.render;
|
|||
import java.awt.Color;
|
||||
import java.util.Random;
|
||||
|
||||
import dev.tilera.auracore.api.CrystalColors;
|
||||
import net.anvilcraft.classiccasting.render.models.ModelCrystal;
|
||||
import net.anvilcraft.classiccasting.tiles.TileCrystalCore;
|
||||
import net.minecraft.client.Minecraft;
|
||||
|
@ -17,8 +18,6 @@ import net.minecraft.util.MathHelper;
|
|||
import net.minecraft.util.ResourceLocation;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import dev.tilera.auracore.api.CrystalColors;
|
||||
|
||||
public class TileCrystalCoreRenderer extends TileEntitySpecialRenderer {
|
||||
private ModelCrystal model;
|
||||
|
||||
|
@ -85,7 +84,8 @@ public class TileCrystalCoreRenderer extends TileEntitySpecialRenderer {
|
|||
) {
|
||||
final TileCrystalCore tco = (TileCrystalCore) te;
|
||||
GL11.glPushMatrix();
|
||||
this.bindTexture(new ResourceLocation("classiccasting", "textures/models/crystal.png")
|
||||
this.bindTexture(
|
||||
new ResourceLocation("classiccasting", "textures/models/crystal.png")
|
||||
);
|
||||
final Random rand = new Random(tco.xCoord + tco.yCoord * tco.zCoord);
|
||||
int col = 0;
|
||||
|
|
|
@ -4,12 +4,8 @@ import cpw.mods.fml.relauncher.Side;
|
|||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.anvilcraft.classiccasting.CCBlocks;
|
||||
import net.anvilcraft.classiccasting.UtilsFX;
|
||||
import net.anvilcraft.classiccasting.items.wands.ItemWandCasting;
|
||||
import net.anvilcraft.classiccasting.tiles.TileInfusionWorkbench;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
|
|
@ -61,7 +61,7 @@ public class TileCrystalCapacitor extends TileEntity {
|
|||
);
|
||||
break;
|
||||
}
|
||||
if (nd.level < nd.baseLevel && this.storedVis> 0) {
|
||||
if (nd.level<nd.baseLevel&& this.storedVis> 0) {
|
||||
AuraManager.queueNodeChanges(
|
||||
nd.key, 1, 0, false, null, 0.0f, 0.0f, 0.0f
|
||||
);
|
||||
|
|
Loading…
Reference in a new issue