crucible UB, drillgon bobble, FEnSU fix

This commit is contained in:
Bob 2021-12-11 17:13:30 +01:00
parent 721bb405eb
commit f57d7f25e2
10 changed files with 1263 additions and 553 deletions

View File

@ -1,6 +1,6 @@
buildscript { buildscript {
repositories { repositories {
maven { url = 'https://files.minecraftforge.net/maven' } maven { url = 'https://maven.minecraftforge.net/' }
maven { url = 'https://plugins.gradle.org/m2' } maven { url = 'https://plugins.gradle.org/m2' }
mavenCentral() mavenCentral()
} }

View File

@ -87,7 +87,7 @@ public class BlockBobble extends BlockContainer {
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs tab, List list) { public void getSubBlocks(Item item, CreativeTabs tab, List list) {
for(int i = 0; i < BobbleType.values().length; i++) for(int i = 1; i < BobbleType.values().length; i++)
list.add(new ItemStack(item, 1, i)); list.add(new ItemStack(item, 1, i));
} }

View File

@ -64,7 +64,8 @@ public class BulletConfiguration {
//whether the bullet should stay alive after colliding with a block //whether the bullet should stay alive after colliding with a block
public boolean liveAfterImpact; public boolean liveAfterImpact;
public boolean blackPowder = true; //creates a "muzzle flash" and a ton of smoke with every projectile spawned
public boolean blackPowder = false;
//bullet effects //bullet effects
public List<PotionEffect> effects; public List<PotionEffect> effects;

View File

@ -1483,7 +1483,7 @@ public class MachineRecipes {
break; break;
case DUCRETE: case DUCRETE:
list.add(new ItemStack(Blocks.sand, 8)); list.add(new ItemStack(Blocks.sand, 8));
list.add(new ItemStack(ModItems.ingot_u238, 10)); list.add(new ItemStack(ModItems.billet_u238, 2));
list.add(new ItemStack(Items.clay_ball, 4)); list.add(new ItemStack(Items.clay_ball, 4));
default: default:
break; break;

View File

@ -346,6 +346,12 @@ public class Library {
//not great either but certainly better //not great either but certainly better
public static long chargeItemsFromTE(ItemStack[] slots, int index, long power, long maxPower) { public static long chargeItemsFromTE(ItemStack[] slots, int index, long power, long maxPower) {
if(power < 0)
return 0;
if(power > maxPower)
return maxPower;
if(slots[index] != null && slots[index].getItem() instanceof IBatteryItem) { if(slots[index] != null && slots[index].getItem() instanceof IBatteryItem) {
IBatteryItem battery = (IBatteryItem) slots[index].getItem(); IBatteryItem battery = (IBatteryItem) slots[index].getItem();

View File

@ -349,7 +349,7 @@ public class CraftingManager {
addRecipeAuto(new ItemStack(ModBlocks.ducrete, 4), new Object[] { "DD", "DD", 'D', ModBlocks.ducrete_smooth }); addRecipeAuto(new ItemStack(ModBlocks.ducrete, 4), new Object[] { "DD", "DD", 'D', ModBlocks.ducrete_smooth });
addRecipeAuto(new ItemStack(ModBlocks.brick_ducrete, 4), new Object[] {"CDC", "DLD", "CDC", 'D', ModBlocks.ducrete_smooth, 'C', Items.clay_ball, 'L', ModItems.plate_lead }); addRecipeAuto(new ItemStack(ModBlocks.brick_ducrete, 4), new Object[] {"CDC", "DLD", "CDC", 'D', ModBlocks.ducrete_smooth, 'C', Items.clay_ball, 'L', ModItems.plate_lead });
addRecipeAuto(new ItemStack(ModBlocks.brick_ducrete, 4), new Object[] {"CDC", "DLD", "CDC", 'D', ModBlocks.ducrete, 'C', Items.clay_ball, 'L', ModItems.plate_lead }); addRecipeAuto(new ItemStack(ModBlocks.brick_ducrete, 4), new Object[] {"CDC", "DLD", "CDC", 'D', ModBlocks.ducrete, 'C', Items.clay_ball, 'L', ModItems.plate_lead });
addRecipeAuto(new ItemStack(ModBlocks.reinforced_ducrete, 4), new Object[] {"DSD", "SUS", "DSD", 'D', ModBlocks.brick_ducrete, 'S', ModItems.plate_steel, 'U', ModItems.ingot_u238 }); addRecipeAuto(new ItemStack(ModBlocks.reinforced_ducrete, 4), new Object[] {"DSD", "SUS", "DSD", 'D', ModBlocks.brick_ducrete, 'S', ModItems.plate_steel, 'U', U238.billet() });
addRecipeAuto(new ItemStack(ModBlocks.brick_obsidian, 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.obsidian }); addRecipeAuto(new ItemStack(ModBlocks.brick_obsidian, 4), new Object[] { "FBF", "BFB", "FBF", 'F', Blocks.iron_bars, 'B', Blocks.obsidian });
addRecipeAuto(new ItemStack(ModBlocks.meteor_polished, 4), new Object[] { "CC", "CC", 'C', ModBlocks.block_meteor_broken }); addRecipeAuto(new ItemStack(ModBlocks.meteor_polished, 4), new Object[] { "CC", "CC", 'C', ModBlocks.block_meteor_broken });
addRecipeAuto(new ItemStack(ModBlocks.meteor_pillar, 2), new Object[] { "C", "C", 'C', ModBlocks.meteor_polished }); addRecipeAuto(new ItemStack(ModBlocks.meteor_pillar, 2), new Object[] { "C", "C", 'C', ModBlocks.meteor_polished });

View File

@ -15,8 +15,6 @@ import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -45,6 +43,7 @@ public class RenderBobble extends TileEntitySpecialRenderer {
public static final ResourceLocation bobble_uffr = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/uffr.png"); public static final ResourceLocation bobble_uffr = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/uffr.png");
public static final ResourceLocation bobble_vaer = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/vaer.png"); public static final ResourceLocation bobble_vaer = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/vaer.png");
public static final ResourceLocation bobble_nos = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/nos.png"); public static final ResourceLocation bobble_nos = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/nos.png");
public static final ResourceLocation bobble_drillgon = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/drillgon200.png");
public static final ResourceLocation bobble_cirno = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/cirno.png"); public static final ResourceLocation bobble_cirno = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/cirno.png");
@Override @Override
@ -94,12 +93,14 @@ public class RenderBobble extends TileEntitySpecialRenderer {
case UFFR: bindTexture(bobble_uffr); break; case UFFR: bindTexture(bobble_uffr); break;
case VAER: bindTexture(bobble_vaer); break; case VAER: bindTexture(bobble_vaer); break;
case NOS: bindTexture(bobble_nos); break; case NOS: bindTexture(bobble_nos); break;
case DRILLGON: bindTexture(bobble_drillgon); break;
default: bindTexture(ResourceManager.universal); default: bindTexture(ResourceManager.universal);
} }
switch(type) { switch(type) {
case PU238: renderPellet(type); break; case PU238: renderPellet(type); break;
case UFFR: renderFumo(type); break; case UFFR: renderFumo(type); break;
case DRILLGON: renderDrillgon(type); break;
default: renderGuy(type); default: renderGuy(type);
} }
@ -355,6 +356,10 @@ public class RenderBobble extends TileEntitySpecialRenderer {
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
public void renderDrillgon(BobbleType type) {
bobble.renderPart("Drillgon");
}
private ModelUboinik shotgun = new ModelUboinik(); private ModelUboinik shotgun = new ModelUboinik();
private ResourceLocation shot_tex = new ResourceLocation(RefStrings.MODID +":textures/models/ModelUboinik.png"); private ResourceLocation shot_tex = new ResourceLocation(RefStrings.MODID +":textures/models/ModelUboinik.png");

View File

@ -23,6 +23,8 @@ public class TileEntityMachineFENSU extends TileEntityMachineBattery {
if(!worldObj.isRemote) { if(!worldObj.isRemote) {
this.transmitPower();
power = Library.chargeTEFromItems(slots, 0, power, maxPower); power = Library.chargeTEFromItems(slots, 0, power, maxPower);
power = Library.chargeItemsFromTE(slots, 1, power, maxPower); power = Library.chargeItemsFromTE(slots, 1, power, maxPower);
@ -40,6 +42,12 @@ public class TileEntityMachineFENSU extends TileEntityMachineBattery {
rotation -= 360; rotation -= 360;
prevRotation -= 360; prevRotation -= 360;
} }
for(int i = 1; i < this.log.length; i++) {
this.log[i - 1] = this.log[i];
}
this.log[19] = this.power;
} }
} }

File diff suppressed because it is too large Load Diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 980 B