mirror of
https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git
synced 2026-01-25 10:32:49 +00:00
pink one detected
This commit is contained in:
parent
9cfdc17115
commit
ba24ed64aa
@ -2,9 +2,16 @@
|
||||
* QMAW now has buttons for returning to previously viewed pages
|
||||
* QMAW file detection now includes subfolders to `manual`
|
||||
* OpenComputers integration for the ZIRNOX should now return values in °C and bar instead of unexplained weird internal units
|
||||
* The sodium and strontium autogen ingots now have their correct hazard tags
|
||||
* Pattern matchers, like the one used on the automatic crafting table, no longer care about NBT data of an item
|
||||
* This means that RBMK fuel rods can now be automatically disassembled without the depletion number having to be a 100% match
|
||||
* Due to the way the RBMK uncrafting handler works, a single autocrafter now correctly supports RBMK fuel of one type of any depletion level, yielding the correct recycling pellets
|
||||
|
||||
## Fixed
|
||||
* Fixed QMAW not working at all
|
||||
* Potentially fixed a bug where proxy tile entities would reference unloaded core tile entities which would cause bizarre item voiding/duping issues in rare cases
|
||||
* Fixed fusion reactor automation being able to remove items other than the breeding output slot
|
||||
* Fixed chunkloading transport drones getting stuck due to off-by-one rounding errors
|
||||
* Fixed chunkloading transport drones getting stuck due to off-by-one rounding errors
|
||||
* Fixed shift-click handling on the electric arc furnace not working with upgrades, and putting electrodes in the wrong slot
|
||||
* Fixed issue with the load order where custom fluids wouldn't work properly for fluid loading/unloading and in custom recipes
|
||||
* Fixed balefire bomb not rendering the egg when fully loaded
|
||||
@ -96,12 +96,16 @@ public class BlockPlushie extends BlockContainer implements IBlockMulti, IToolti
|
||||
@Override
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
|
||||
|
||||
TileEntityPlushie plushie = (TileEntityPlushie) world.getTileEntity(x, y, z);
|
||||
if(world.isRemote) {
|
||||
TileEntityPlushie plushie = (TileEntityPlushie) world.getTileEntity(x, y, z);
|
||||
plushie.squishTimer = 11;
|
||||
return true;
|
||||
} else {
|
||||
world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:block.squeakyToy", 0.25F, 1F);
|
||||
if(plushie.type == PlushieType.HUNDUN) {
|
||||
world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:block.hunduns_magnificent_howl", 100F, 1F);
|
||||
} else {
|
||||
world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:block.squeakyToy", 0.25F, 1F);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@ -155,7 +159,7 @@ public class BlockPlushie extends BlockContainer implements IBlockMulti, IToolti
|
||||
NONE( "NONE", null),
|
||||
YOMI( "Yomi", "Hi! Can I be your rabbit friend?"),
|
||||
NUMBERNINE( "Number Nine", "None of y'all deserve coal."),
|
||||
POOH( "Winnie the Pooh", "Beloved children's character with no malicious intent.");
|
||||
HUNDUN( "Hundun", "混沌");
|
||||
|
||||
public String label;
|
||||
public String inscription;
|
||||
|
||||
@ -203,8 +203,6 @@ public class EntityDeliveryDrone extends EntityDroneBase implements IInventory,
|
||||
for (ChunkCoordIntPair chunk : ChunkShapeHelper.getChunksAlongLineSegment((int) Math.floor(this.posX), (int) Math.floor(this.posZ), (int) Math.floor(this.posX + this.motionX), (int) Math.floor(this.posZ + this.motionZ), 8)){
|
||||
ForgeChunkManager.forceChunk(loaderTicket, chunk);
|
||||
}
|
||||
|
||||
System.out.println("guhhh");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -454,7 +454,7 @@ public class OreDictManager {
|
||||
* HAZARDS, MISC
|
||||
*/
|
||||
LI .hydro(1F) .ingot(lithium) .dustSmall(powder_lithium_tiny) .dust(powder_lithium) .block(block_lithium) .ore(ore_gneiss_lithium);
|
||||
NA .hydro(1F) .dust(powder_sodium);
|
||||
NA .hydro(1F) .hazIngot() .dust(powder_sodium);
|
||||
|
||||
/*
|
||||
* PHOSPHORUS
|
||||
@ -494,7 +494,7 @@ public class OreDictManager {
|
||||
/*
|
||||
* FISSION FRAGMENTS
|
||||
*/
|
||||
SR .hot(1F) .hydro(1F) .dust(powder_strontium);
|
||||
SR .hot(1F) .hydro(1F) .hazIngot() .dust(powder_strontium);
|
||||
SR90 .rad(HazardRegistry.sr90) .hot(1F) .hydro(1F) .dustSmall(powder_sr90_tiny) .dust(powder_sr90) .ingot(ingot_sr90) .billet(billet_sr90) .nugget(nugget_sr90);
|
||||
I131 .rad(HazardRegistry.i131) .hot(1F) .dustSmall(powder_i131_tiny) .dust(powder_i131);
|
||||
XE135 .rad(HazardRegistry.xe135) .hot(10F) .dustSmall(powder_xe135_tiny) .dust(powder_xe135);
|
||||
@ -912,6 +912,21 @@ public class OreDictManager {
|
||||
for(Block b : blocks) registerStack(tag, new ItemStack(b));
|
||||
return this;
|
||||
}
|
||||
|
||||
public DictFrame hazIngot() {
|
||||
hazMult = HazardRegistry.ingot;
|
||||
return autoRegHazard(INGOT);
|
||||
}
|
||||
|
||||
// TODO: rethink this. currently, keys are only registered on-demand if the dict frame has a valid entry, even though we can maximize compatibility
|
||||
// by simply registereing all known shapes in the haz reg, whether it exists or not
|
||||
public DictFrame autoRegHazard(MaterialShapes shape) {
|
||||
String tag = shape.name();
|
||||
for(String mat : mats) {
|
||||
registerHazards(hazards, hazMult, tag + mat);
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
public static void registerHazards(List<HazardEntry> hazards, float hazMult, String dictKey) {
|
||||
|
||||
|
||||
@ -61,9 +61,9 @@ public class ContainerMachineArcFurnaceLarge extends Container {
|
||||
if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
|
||||
if(!InventoryUtil.mergeItemStack(this.inventorySlots, stack, 3, 4, false)) return null;
|
||||
} else if(rStack.getItem() == ModItems.arc_electrode) {
|
||||
if(!InventoryUtil.mergeItemStack(this.inventorySlots, stack, 4, 5, false)) return null;
|
||||
} else if(rStack.getItem() instanceof ItemMachineUpgrade) {
|
||||
if(!InventoryUtil.mergeItemStack(this.inventorySlots, stack, 0, 3, false)) return null;
|
||||
} else if(rStack.getItem() instanceof ItemMachineUpgrade) {
|
||||
if(!InventoryUtil.mergeItemStack(this.inventorySlots, stack, 4, 5, false)) return null;
|
||||
} else {
|
||||
if(!InventoryUtil.mergeItemStack(this.inventorySlots, stack, 5, 25, false)) return null;
|
||||
}
|
||||
|
||||
@ -851,6 +851,12 @@ public class MainRegistry {
|
||||
|
||||
@EventHandler
|
||||
public static void PostLoad(FMLPostInitializationEvent PostEvent) {
|
||||
// to make sure that foreign registered fluids are accounted for,
|
||||
// even when the reload listener is registered too late due to load order
|
||||
// IMPORTANT: fluids have to load before recipes. weird shit happens if not.
|
||||
Fluids.reloadFluids();
|
||||
FluidContainerRegistry.register();
|
||||
|
||||
MagicRecipes.register();
|
||||
LemegetonRecipes.register();
|
||||
SILEXRecipes.register();
|
||||
@ -879,7 +885,6 @@ public class MainRegistry {
|
||||
ArmorUtil.register();
|
||||
HazmatRegistry.registerHazmats();
|
||||
DamageResistanceHandler.init();
|
||||
FluidContainerRegistry.register();
|
||||
BlockToolConversion.registerRecipes();
|
||||
AchievementHandler.register();
|
||||
|
||||
@ -912,10 +917,6 @@ public class MainRegistry {
|
||||
SuicideThreadDump.register();
|
||||
CommandReloadClient.register();
|
||||
|
||||
// to make sure that foreign registered fluids are accounted for,
|
||||
// even when the reload listener is registered too late due to load order
|
||||
Fluids.reloadFluids();
|
||||
|
||||
//ExplosionTests.runTest();
|
||||
}
|
||||
|
||||
|
||||
@ -139,8 +139,8 @@ public class ModulePatternMatcher {
|
||||
}
|
||||
|
||||
switch(mode) {
|
||||
case MODE_EXACT: return input.isItemEqual(filter) && ItemStack.areItemStackTagsEqual(input, filter);
|
||||
case MODE_WILDCARD: return input.getItem() == filter.getItem() && ItemStack.areItemStackTagsEqual(input, filter);
|
||||
case MODE_EXACT: return input.isItemEqual(filter)/* && ItemStack.areItemStackTagsEqual(input, filter)*/;
|
||||
case MODE_WILDCARD: return input.getItem() == filter.getItem()/* && ItemStack.areItemStackTagsEqual(input, filter)*/;
|
||||
case MODE_BEDROCK:
|
||||
if(input.getItem() != filter.getItem()) return false;
|
||||
if(!(input.getItem() instanceof ItemBedrockOreNew)) return false;
|
||||
|
||||
@ -15,50 +15,44 @@ import net.minecraft.util.ResourceLocation;
|
||||
|
||||
public class RenderNukeFstbmb extends TileEntitySpecialRenderer {
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
|
||||
{
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslated(x + 0.5D, y, z + 0.5D);
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
GL11.glDisable(GL11.GL_CULL_FACE);
|
||||
switch(tileEntity.getBlockMetadata())
|
||||
{
|
||||
case 2:
|
||||
GL11.glRotatef(90, 0F, 1F, 0F); break;
|
||||
case 4:
|
||||
GL11.glRotatef(180, 0F, 1F, 0F); break;
|
||||
case 3:
|
||||
GL11.glRotatef(270, 0F, 1F, 0F); break;
|
||||
case 5:
|
||||
GL11.glRotatef(0, 0F, 1F, 0F); break;
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) {
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslated(x + 0.5D, y, z + 0.5D);
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
GL11.glDisable(GL11.GL_CULL_FACE);
|
||||
|
||||
switch(tileEntity.getBlockMetadata()) {
|
||||
case 2: GL11.glRotatef(90, 0F, 1F, 0F); break;
|
||||
case 4: GL11.glRotatef(180, 0F, 1F, 0F); break;
|
||||
case 3: GL11.glRotatef(270, 0F, 1F, 0F); break;
|
||||
case 5: GL11.glRotatef(0, 0F, 1F, 0F); break;
|
||||
}
|
||||
|
||||
GL11.glShadeModel(GL11.GL_SMOOTH);
|
||||
bindTexture(ResourceManager.fstbmb_tex);
|
||||
ResourceManager.fstbmb.renderPart("Body");
|
||||
ResourceManager.fstbmb.renderPart("Balefire");
|
||||
|
||||
TileEntityNukeBalefire bf = (TileEntityNukeBalefire)tileEntity;
|
||||
|
||||
if(bf.loaded) {
|
||||
bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/misc/glintBF.png"));
|
||||
RenderMiscEffects.renderClassicGlint(tileEntity.getWorldObj(), f, ResourceManager.fstbmb, "Balefire", 0.0F, 0.8F, 0.15F, 5, 2F);
|
||||
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
float f3 = 0.04F;
|
||||
GL11.glTranslatef(0.815F, 0.9275F, 0.5F);
|
||||
GL11.glScalef(f3, -f3, f3);
|
||||
GL11.glNormal3f(0.0F, 0.0F, -1.0F * f3);
|
||||
GL11.glRotatef(90, 0, 1, 0);
|
||||
GL11.glDepthMask(false);
|
||||
GL11.glTranslatef(0, 1, 0);
|
||||
font.drawString(bf.getMinutes() + ":" + bf.getSeconds(), 0, 0, 0xff0000);
|
||||
GL11.glDepthMask(true);
|
||||
}
|
||||
|
||||
GL11.glShadeModel(GL11.GL_FLAT);
|
||||
GL11.glShadeModel(GL11.GL_SMOOTH);
|
||||
bindTexture(ResourceManager.fstbmb_tex);
|
||||
ResourceManager.fstbmb.renderPart("Body");
|
||||
ResourceManager.fstbmb.renderPart("Balefire");
|
||||
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
TileEntityNukeBalefire bf = (TileEntityNukeBalefire) tileEntity;
|
||||
|
||||
if(bf.loaded) {
|
||||
bindTexture(new ResourceLocation(RefStrings.MODID + ":textures/misc/glintBF.png"));
|
||||
RenderMiscEffects.renderClassicGlint(tileEntity.getWorldObj(), f, ResourceManager.fstbmb, "Balefire", 0.0F, 0.8F, 0.15F, 5, 2F);
|
||||
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
float f3 = 0.04F;
|
||||
GL11.glTranslatef(0.815F, 0.9275F, 0.5F);
|
||||
GL11.glScalef(f3, -f3, f3);
|
||||
GL11.glNormal3f(0.0F, 0.0F, -1.0F * f3);
|
||||
GL11.glRotatef(90, 0, 1, 0);
|
||||
GL11.glDepthMask(false);
|
||||
GL11.glTranslatef(0, 1, 0);
|
||||
font.drawString(bf.getMinutes() + ":" + bf.getSeconds(), 0, 0, 0xff0000);
|
||||
GL11.glDepthMask(true);
|
||||
}
|
||||
|
||||
GL11.glShadeModel(GL11.GL_FLAT);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
}
|
||||
|
||||
@ -30,10 +30,10 @@ import net.minecraftforge.client.model.IModelCustom;
|
||||
public class RenderPlushie extends TileEntitySpecialRenderer implements IItemRendererProvider {
|
||||
|
||||
public static final IModelCustom yomiModel = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/trinkets/yomi.obj"), false).asVBO();
|
||||
public static final IModelCustom poohModel = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/trinkets/pooh.obj"), false).asVBO();
|
||||
public static final IModelCustom hundunModel = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/trinkets/hundun.obj"), false).asVBO();
|
||||
public static final ResourceLocation yomiTex = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/yomi.png");
|
||||
public static final ResourceLocation numbernineTex = new ResourceLocation(RefStrings.MODID, "textures/models/horse/numbernine.png");
|
||||
public static final ResourceLocation poohTex = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/pooh.png");
|
||||
public static final ResourceLocation hundunTex = new ResourceLocation(RefStrings.MODID, "textures/models/trinkets/hundun.png");
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float interp) {
|
||||
@ -53,7 +53,7 @@ public class RenderPlushie extends TileEntitySpecialRenderer implements IItemRen
|
||||
case NONE: break;
|
||||
case YOMI: GL11.glScaled(0.5, 0.5, 0.5); break;
|
||||
case NUMBERNINE: GL11.glScaled(0.75, 0.75, 0.75); break;
|
||||
case POOH: GL11.glScaled(0.75, 0.75, 0.75); break;
|
||||
case HUNDUN: GL11.glScaled(1, 1, 1); break;
|
||||
}
|
||||
renderPlushie(te.type);
|
||||
|
||||
@ -110,9 +110,9 @@ public class RenderPlushie extends TileEntitySpecialRenderer implements IItemRen
|
||||
IIcon icon = stack.getIconIndex();
|
||||
ItemRenderer.renderItemIn2D(Tessellator.instance, icon.getMaxU(), icon.getMinV(), icon.getMinU(), icon.getMaxV(), icon.getIconWidth(), icon.getIconHeight(), 0.0625F);
|
||||
break;
|
||||
case POOH:
|
||||
Minecraft.getMinecraft().getTextureManager().bindTexture(poohTex);
|
||||
poohModel.renderAll();
|
||||
case HUNDUN:
|
||||
Minecraft.getMinecraft().getTextureManager().bindTexture(hundunTex);
|
||||
hundunModel.renderPart("goober_posed");
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -138,7 +138,7 @@ public class RenderPlushie extends TileEntitySpecialRenderer implements IItemRen
|
||||
case NONE: break;
|
||||
case YOMI: GL11.glScaled(1.25, 1.25, 1.25); break;
|
||||
case NUMBERNINE: GL11.glTranslated(0, 0.25, 0.25); GL11.glScaled(1.25, 1.25, 1.25); break;
|
||||
case POOH: GL11.glTranslated(0, 0.25, 0); GL11.glScaled(1.5, 1.5, 1.5); break;
|
||||
case HUNDUN: GL11.glTranslated(0.5, 0.5, 0); GL11.glScaled(1.25, 1.25, 1.25); break;
|
||||
}
|
||||
renderPlushie(type);
|
||||
}};
|
||||
|
||||
@ -40,7 +40,9 @@ public class TileEntityNukeBalefire extends TileEntityMachineBase implements IGU
|
||||
|
||||
if(!worldObj.isRemote) {
|
||||
|
||||
if(!this.isLoaded()) {
|
||||
this.loaded = this.isLoaded();
|
||||
|
||||
if(!loaded) {
|
||||
started = false;
|
||||
}
|
||||
|
||||
@ -89,21 +91,15 @@ public class TileEntityNukeBalefire extends TileEntityMachineBase implements IGU
|
||||
}
|
||||
|
||||
public boolean isLoaded() {
|
||||
|
||||
return hasEgg() && hasBattery();
|
||||
}
|
||||
|
||||
public boolean hasEgg() {
|
||||
|
||||
if(slots[0] != null && slots[0].getItem() == ModItems.egg_balefire) {
|
||||
return true;
|
||||
}
|
||||
|
||||
if(slots[0] != null && slots[0].getItem() == ModItems.egg_balefire) return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean hasBattery() {
|
||||
|
||||
return getBattery() > 0;
|
||||
}
|
||||
|
||||
|
||||
@ -239,7 +239,7 @@ public class TileEntityMachineAutocrafter extends TileEntityMachineBase implemen
|
||||
ItemStack valid = slots[i];
|
||||
|
||||
if(valid == null) return false; //null? since slots[slot] is not null by now, this other slot needs the item more
|
||||
if(!(valid.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(valid, stack))) continue; //different item anyway? out with it
|
||||
if(!(valid.isItemEqual(stack)/* && ItemStack.areItemStackTagsEqual(valid, stack)*/)) continue; //different item anyway? out with it
|
||||
|
||||
//if there is another slot that actually does need the same item more, cancel
|
||||
if(valid.stackSize < size)
|
||||
|
||||
1538
src/main/resources/assets/hbm/models/trinkets/hundun.obj
Normal file
1538
src/main/resources/assets/hbm/models/trinkets/hundun.obj
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,334 +0,0 @@
|
||||
# Blender v2.79 (sub 0) OBJ File: 'pooh.blend'
|
||||
# www.blender.org
|
||||
o Cube_Cube.001
|
||||
v -0.250000 0.062500 0.250000
|
||||
v 0.250000 0.062500 0.250000
|
||||
v -0.250000 0.062500 -0.250000
|
||||
v 0.250000 0.062500 -0.250000
|
||||
v -0.250000 0.437500 0.250000
|
||||
v 0.250000 0.437500 0.250000
|
||||
v -0.250000 0.437500 -0.250000
|
||||
v 0.250000 0.437500 -0.250000
|
||||
v -0.187500 0.437500 0.187500
|
||||
v 0.187500 0.437500 0.187500
|
||||
v -0.187500 0.437500 -0.187500
|
||||
v 0.187500 0.437500 -0.187500
|
||||
v -0.187500 0.625000 -0.187500
|
||||
v -0.187500 0.625000 0.187500
|
||||
v 0.187500 0.625000 0.187500
|
||||
v 0.187500 0.625000 -0.187500
|
||||
v -0.250000 0.625000 0.250000
|
||||
v 0.250000 0.625000 0.250000
|
||||
v -0.250000 0.625000 -0.250000
|
||||
v 0.250000 0.625000 -0.250000
|
||||
v -0.250000 1.125000 -0.250000
|
||||
v -0.250000 1.125000 0.250000
|
||||
v 0.250000 1.125000 0.250000
|
||||
v 0.250000 1.125000 -0.250000
|
||||
v -0.125000 0.000000 -0.062500
|
||||
v 0.500000 0.000000 -0.062500
|
||||
v -0.125000 0.000000 -0.187500
|
||||
v 0.500000 0.000000 -0.187500
|
||||
v -0.125000 0.125000 -0.187500
|
||||
v -0.125000 0.125000 -0.062500
|
||||
v 0.500000 0.125000 -0.062500
|
||||
v 0.500000 0.125000 -0.187500
|
||||
v -0.125000 0.000000 0.187500
|
||||
v 0.500000 0.000000 0.187500
|
||||
v -0.125000 0.000000 0.062500
|
||||
v 0.500000 0.000000 0.062500
|
||||
v -0.125000 0.125000 0.062500
|
||||
v -0.125000 0.125000 0.187500
|
||||
v 0.500000 0.125000 0.187500
|
||||
v 0.500000 0.125000 0.062500
|
||||
v -0.062500 0.606694 -0.169194
|
||||
v 0.062500 0.606694 -0.169194
|
||||
v -0.062500 0.518306 -0.080806
|
||||
v 0.062500 0.518306 -0.080806
|
||||
v -0.062500 0.253141 -0.345971
|
||||
v -0.062500 0.341529 -0.434359
|
||||
v 0.062500 0.341529 -0.434359
|
||||
v 0.062500 0.253141 -0.345971
|
||||
v -0.062500 0.606694 0.169194
|
||||
v 0.062500 0.606694 0.169194
|
||||
v -0.062500 0.518306 0.080806
|
||||
v 0.062500 0.518306 0.080806
|
||||
v -0.062500 0.253141 0.345971
|
||||
v -0.062500 0.341529 0.434359
|
||||
v 0.062500 0.341529 0.434359
|
||||
v 0.062500 0.253141 0.345971
|
||||
v 0.250000 0.781250 0.031250
|
||||
v 0.250000 0.718750 0.031250
|
||||
v 0.250000 0.781250 -0.031250
|
||||
v 0.250000 0.718750 -0.031250
|
||||
v 0.312500 0.781250 -0.031250
|
||||
v 0.312500 0.781250 0.031250
|
||||
v 0.312500 0.718750 0.031250
|
||||
v 0.312500 0.718750 -0.031250
|
||||
v -0.093750 1.062500 -0.125000
|
||||
v 0.093750 1.062500 -0.125000
|
||||
v -0.093750 1.062500 -0.312500
|
||||
v 0.093750 1.062500 -0.312500
|
||||
v -0.093750 1.250000 -0.312500
|
||||
v -0.093750 1.250000 -0.125000
|
||||
v 0.093750 1.250000 -0.125000
|
||||
v 0.093750 1.250000 -0.312500
|
||||
v -0.093750 1.062500 0.312500
|
||||
v 0.093750 1.062500 0.312500
|
||||
v -0.093750 1.062500 0.125000
|
||||
v 0.093750 1.062500 0.125000
|
||||
v -0.093750 1.250000 0.125000
|
||||
v -0.093750 1.250000 0.312500
|
||||
v 0.093750 1.250000 0.312500
|
||||
v 0.093750 1.250000 0.125000
|
||||
vt 0.400000 -0.000000
|
||||
vt 0.200000 0.173913
|
||||
vt 0.200000 -0.000000
|
||||
vt 0.200000 0.304348
|
||||
vt 0.400000 0.478261
|
||||
vt 0.200000 0.478261
|
||||
vt 0.600000 0.173913
|
||||
vt 0.400000 0.304348
|
||||
vt 0.400000 0.173913
|
||||
vt 0.000000 0.304348
|
||||
vt 0.000000 0.173913
|
||||
vt 0.800000 0.173913
|
||||
vt 0.600000 0.304348
|
||||
vt 0.700000 0.304348
|
||||
vt 0.550000 0.369565
|
||||
vt 0.550000 0.304348
|
||||
vt 1.000000 0.304348
|
||||
vt 0.850000 0.369565
|
||||
vt 0.850000 0.304348
|
||||
vt 0.700000 0.369565
|
||||
vt 0.400000 0.369565
|
||||
vt 0.400000 0.304348
|
||||
vt 0.400000 0.478261
|
||||
vt 0.200000 0.652174
|
||||
vt 0.200000 0.478261
|
||||
vt 0.200000 0.826087
|
||||
vt 0.400000 1.000000
|
||||
vt 0.200000 1.000000
|
||||
vt 0.600000 0.652174
|
||||
vt 0.400000 0.826087
|
||||
vt 0.400000 0.652174
|
||||
vt -0.000000 0.826087
|
||||
vt -0.000000 0.652174
|
||||
vt 0.800000 0.652174
|
||||
vt 0.600000 0.826087
|
||||
vt 0.900000 0.260870
|
||||
vt 0.950000 0.043478
|
||||
vt 0.950000 0.260870
|
||||
vt 0.800000 0.043478
|
||||
vt 0.850000 0.260870
|
||||
vt 0.800000 0.260870
|
||||
vt 0.850000 -0.000000
|
||||
vt 0.800000 0.000000
|
||||
vt 0.800000 0.304348
|
||||
vt 0.850000 0.304348
|
||||
vt 0.850000 0.043478
|
||||
vt 0.900000 0.043478
|
||||
vt 1.000000 0.260870
|
||||
vt 0.900000 0.260870
|
||||
vt 0.950000 0.043478
|
||||
vt 0.950000 0.260870
|
||||
vt 0.800000 0.043478
|
||||
vt 0.850000 0.260870
|
||||
vt 0.800000 0.260870
|
||||
vt 0.850000 -0.000000
|
||||
vt 0.800000 0.000000
|
||||
vt 0.800000 0.304348
|
||||
vt 0.850000 0.304348
|
||||
vt 0.850000 0.043478
|
||||
vt 0.900000 0.043478
|
||||
vt 1.000000 0.260870
|
||||
vt 0.550000 0.369565
|
||||
vt 0.475000 0.434783
|
||||
vt 0.475000 0.369565
|
||||
vt 0.400000 0.043478
|
||||
vt 0.450000 0.000000
|
||||
vt 0.450000 0.043478
|
||||
vt 0.600000 0.173913
|
||||
vt 0.550000 0.043478
|
||||
vt 0.600000 0.043478
|
||||
vt 0.450000 0.173913
|
||||
vt 0.500000 0.043478
|
||||
vt 0.500000 0.173913
|
||||
vt 0.550000 0.173913
|
||||
vt 0.400000 0.173913
|
||||
vt 0.400000 0.000000
|
||||
vt 0.450000 0.043478
|
||||
vt 0.400000 0.043478
|
||||
vt 0.500000 0.173913
|
||||
vt 0.450000 0.173913
|
||||
vt 0.550000 0.043478
|
||||
vt 0.600000 0.173913
|
||||
vt 0.550000 0.173913
|
||||
vt 0.500000 0.043478
|
||||
vt 0.400000 0.173913
|
||||
vt 0.425000 0.521739
|
||||
vt 0.450000 0.543478
|
||||
vt 0.425000 0.543478
|
||||
vt 0.425000 0.565217
|
||||
vt 0.450000 0.565217
|
||||
vt 0.475000 0.543478
|
||||
vt 0.450000 0.521739
|
||||
vt 0.475000 0.521739
|
||||
vt 0.400000 0.521739
|
||||
vt 0.400000 0.543478
|
||||
vt 0.450000 0.500000
|
||||
vt 0.425000 0.500000
|
||||
vt 0.475000 0.500000
|
||||
vt 0.550000 0.565217
|
||||
vt 0.475000 0.565217
|
||||
vt 0.550000 0.434783
|
||||
vt 0.700000 0.434783
|
||||
vt 0.625000 0.500000
|
||||
vt 0.625000 0.434783
|
||||
vt 0.550000 0.500000
|
||||
vt 0.400000 0.500000
|
||||
vt 0.400000 0.434783
|
||||
vt 0.550000 0.369565
|
||||
vt 0.475000 0.434783
|
||||
vt 0.475000 0.369565
|
||||
vt 0.475000 0.500000
|
||||
vt 0.550000 0.565217
|
||||
vt 0.475000 0.565217
|
||||
vt 0.550000 0.434783
|
||||
vt 0.700000 0.434783
|
||||
vt 0.625000 0.500000
|
||||
vt 0.625000 0.434783
|
||||
vt 0.550000 0.500000
|
||||
vt 0.400000 0.500000
|
||||
vt 0.400000 0.434783
|
||||
vt 0.800000 0.304348
|
||||
vt 1.000000 0.369565
|
||||
vt 0.800000 0.826087
|
||||
vt 1.000000 0.043478
|
||||
vt 1.000000 0.043478
|
||||
vt 0.400000 0.000000
|
||||
vt 0.450000 0.000000
|
||||
vt 0.600000 0.043478
|
||||
vt 0.700000 0.500000
|
||||
vt 0.700000 0.500000
|
||||
vn 0.0000 -1.0000 0.0000
|
||||
vn 0.0000 1.0000 0.0000
|
||||
vn 0.0000 0.0000 -1.0000
|
||||
vn 0.0000 0.0000 1.0000
|
||||
vn 1.0000 0.0000 0.0000
|
||||
vn -1.0000 0.0000 0.0000
|
||||
vn 0.0000 -0.7071 -0.7071
|
||||
vn 0.0000 -0.7071 0.7071
|
||||
vn 0.0000 0.7071 -0.7071
|
||||
vn 0.0000 0.7071 0.7071
|
||||
s off
|
||||
f 3/1/1 2/2/1 1/3/1
|
||||
f 6/4/2 7/5/2 5/6/2
|
||||
f 3/7/3 8/8/3 4/9/3
|
||||
f 2/2/4 5/10/4 1/11/4
|
||||
f 4/9/5 6/4/5 2/2/5
|
||||
f 1/12/6 7/13/6 3/7/6
|
||||
f 12/14/5 15/15/5 10/16/5
|
||||
f 9/17/6 13/18/6 11/19/6
|
||||
f 11/19/3 16/20/3 12/14/3
|
||||
f 10/16/4 14/21/4 9/22/4
|
||||
f 19/23/1 18/24/1 17/25/1
|
||||
f 23/26/2 21/27/2 22/28/2
|
||||
f 19/29/3 24/30/3 20/31/3
|
||||
f 18/24/4 22/32/4 17/33/4
|
||||
f 20/31/5 23/26/5 18/24/5
|
||||
f 17/34/6 21/35/6 19/29/6
|
||||
f 27/36/1 26/37/1 25/38/1
|
||||
f 31/39/2 29/40/2 30/41/2
|
||||
f 28/42/5 31/39/5 26/43/5
|
||||
f 25/44/6 29/40/6 27/45/6
|
||||
f 27/36/3 32/46/3 28/47/3
|
||||
f 26/37/4 30/48/4 25/38/4
|
||||
f 35/49/1 34/50/1 33/51/1
|
||||
f 39/52/2 37/53/2 38/54/2
|
||||
f 36/55/5 39/52/5 34/56/5
|
||||
f 33/57/6 37/53/6 35/58/6
|
||||
f 35/49/3 40/59/3 36/60/3
|
||||
f 34/50/4 38/61/4 33/51/4
|
||||
f 67/62/1 66/63/1 65/64/1
|
||||
f 47/65/7 45/66/7 46/67/7
|
||||
f 42/68/5 48/69/5 47/70/5
|
||||
f 41/71/6 45/72/6 43/73/6
|
||||
f 43/73/8 48/69/8 44/74/8
|
||||
f 42/75/9 46/67/9 41/71/9
|
||||
f 53/76/8 55/77/8 54/78/8
|
||||
f 55/77/5 52/79/5 50/80/5
|
||||
f 53/81/6 49/82/6 51/83/6
|
||||
f 56/84/7 51/83/7 52/79/7
|
||||
f 54/78/10 50/80/10 49/85/10
|
||||
f 63/86/5 61/87/5 62/88/5
|
||||
f 57/89/2 61/87/2 59/90/2
|
||||
f 59/91/3 64/92/3 60/93/3
|
||||
f 58/94/4 62/88/4 57/95/4
|
||||
f 60/96/1 63/86/1 58/97/1
|
||||
f 71/98/2 69/99/2 70/100/2
|
||||
f 68/101/5 71/98/5 66/63/5
|
||||
f 65/102/6 69/103/6 67/104/6
|
||||
f 67/104/3 72/105/3 68/101/3
|
||||
f 66/63/4 70/106/4 65/107/4
|
||||
f 75/108/1 74/109/1 73/110/1
|
||||
f 79/111/2 77/112/2 78/113/2
|
||||
f 76/114/5 79/111/5 74/109/5
|
||||
f 73/115/6 77/116/6 75/117/6
|
||||
f 75/117/3 80/118/3 76/114/3
|
||||
f 74/109/4 78/119/4 73/120/4
|
||||
f 3/1/1 4/9/1 2/2/1
|
||||
f 6/4/2 8/8/2 7/5/2
|
||||
f 3/7/3 7/13/3 8/8/3
|
||||
f 2/2/4 6/4/4 5/10/4
|
||||
f 4/9/5 8/8/5 6/4/5
|
||||
f 1/12/6 5/121/6 7/13/6
|
||||
f 12/14/5 16/20/5 15/15/5
|
||||
f 9/17/6 14/122/6 13/18/6
|
||||
f 11/19/3 13/18/3 16/20/3
|
||||
f 10/16/4 15/15/4 14/21/4
|
||||
f 19/23/1 20/31/1 18/24/1
|
||||
f 23/26/2 24/30/2 21/27/2
|
||||
f 19/29/3 21/35/3 24/30/3
|
||||
f 18/24/4 23/26/4 22/32/4
|
||||
f 20/31/5 24/30/5 23/26/5
|
||||
f 17/34/6 22/123/6 21/35/6
|
||||
f 27/36/1 28/47/1 26/37/1
|
||||
f 31/39/2 32/46/2 29/40/2
|
||||
f 28/42/5 32/46/5 31/39/5
|
||||
f 25/44/6 30/41/6 29/40/6
|
||||
f 27/36/3 29/40/3 32/46/3
|
||||
f 26/37/4 31/124/4 30/48/4
|
||||
f 35/49/1 36/60/1 34/50/1
|
||||
f 39/52/2 40/59/2 37/53/2
|
||||
f 36/55/5 40/59/5 39/52/5
|
||||
f 33/57/6 38/54/6 37/53/6
|
||||
f 35/49/3 37/53/3 40/59/3
|
||||
f 34/50/4 39/125/4 38/61/4
|
||||
f 67/62/1 68/101/1 66/63/1
|
||||
f 47/65/7 48/126/7 45/66/7
|
||||
f 42/68/5 44/74/5 48/69/5
|
||||
f 41/71/6 46/67/6 45/72/6
|
||||
f 43/73/8 45/72/8 48/69/8
|
||||
f 42/75/9 47/65/9 46/67/9
|
||||
f 53/76/8 56/127/8 55/77/8
|
||||
f 55/77/5 56/84/5 52/79/5
|
||||
f 53/81/6 54/128/6 49/82/6
|
||||
f 56/84/7 53/81/7 51/83/7
|
||||
f 54/78/10 55/77/10 50/80/10
|
||||
f 63/86/5 64/92/5 61/87/5
|
||||
f 57/89/2 62/88/2 61/87/2
|
||||
f 59/91/3 61/87/3 64/92/3
|
||||
f 58/94/4 63/86/4 62/88/4
|
||||
f 60/96/1 64/92/1 63/86/1
|
||||
f 71/98/2 72/105/2 69/99/2
|
||||
f 68/101/5 72/105/5 71/98/5
|
||||
f 65/102/6 70/129/6 69/103/6
|
||||
f 67/104/3 69/103/3 72/105/3
|
||||
f 66/63/4 71/98/4 70/106/4
|
||||
f 75/108/1 76/114/1 74/109/1
|
||||
f 79/111/2 80/118/2 77/112/2
|
||||
f 76/114/5 80/118/5 79/111/5
|
||||
f 73/115/6 78/130/6 77/116/6
|
||||
f 75/117/3 77/116/3 80/118/3
|
||||
f 74/109/4 79/111/4 78/119/4
|
||||
@ -64,6 +64,7 @@
|
||||
"block.fel": {"category": "block", "sounds": [{"name": "block/fel", "stream": false}]},
|
||||
"block.hephaestusRunning": {"category": "block", "sounds": [{"name": "block/hephaestusRunning", "stream": false}]},
|
||||
"block.squeakyToy": {"category": "block", "sounds": [{"name": "block/squeakyToy", "stream": false}]},
|
||||
"block.hunduns_magnificent_howl": {"category": "block", "sounds": [{"name": "block/hunduns_magnificent_howl", "stream": false}]},
|
||||
"block.pyroOperate": {"category": "block", "sounds": [{"name": "block/pyroOperate", "stream": false}]},
|
||||
"block.motor": {"category": "block", "sounds": [{"name": "block/motor", "stream": false}]},
|
||||
"block.engine": {"category": "block", "sounds": [{"name": "block/engine", "stream": false}]},
|
||||
|
||||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 337 B After Width: | Height: | Size: 270 B |
Binary file not shown.
|
Before Width: | Height: | Size: 181 B After Width: | Height: | Size: 153 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 409 B |
Loading…
x
Reference in New Issue
Block a user