Permalink
Browse files

Merge branch 'dev' of https://github.com/Ri5ux/AliensVsPredator into dev

  • Loading branch information...
Ri5ux committed Jan 12, 2018
2 parents 1cdc900 + b0b6224 commit 990e4a54cd81635d6f8c68dae8e2bd8285222b89
View
@@ -42,9 +42,9 @@ def version_major=5
def version_minor=0
def version_micro=0
def version_minecraft="1.10.2"
def version_forge="12.18.3.2221"
def version_forge="12.18.3.2511"
def version_mappings="stable_29"
def mdxversion="2.0.0.27"
def mdxversion="2.0.0.33"
def curseforge_id="221641"
def curseforge_release_type="beta"
def curseforge_api_key=project.ext.properties.curseforge_api_key == null ? "00000-00000-00000-00000-00000" : project.ext.properties.curseforge_api_key
@@ -53,6 +53,10 @@ private void addOreDictionarySupport(ItemHandler items, BlockHandler blocks)
OreDictionary.registerOre("itemPlastic", items.itemPolycarbonate);
OreDictionary.registerOre("logWood", blocks.gigerLog);
OreDictionary.registerOre("log", blocks.gigerLog);
OreDictionary.registerOre("neodymium", items.neodymium);
OreDictionary.registerOre("oreMonazite", blocks.oreMonazite);
OreDictionary.registerOre("cobalt", items.cobalt);
OreDictionary.registerOre("oreCobalt", blocks.oreCobalt);
}
private void addRecipes(ItemHandler items, BlockHandler blocks)
@@ -122,6 +126,7 @@ private void addRecipes(ItemHandler items, BlockHandler blocks)
GameRegistry.addRecipe(new ItemStack(items.itemDoritosCoolRanch, 1), "ab", "b ", 'a', items.itemDoritos, 'b', Items.WHEAT);
GameRegistry.addRecipe(new ItemStack(blocks.muthurPanel1, 1), "aba", "bcb", "aba", 'a', Items.GLOWSTONE_DUST, 'b', Items.REDSTONE, 'c', items.itemSilicon);
GameRegistry.addRecipe(new ItemStack(blocks.muthurPanel2, 1), "bab", "aca", "bab", 'a', Items.GLOWSTONE_DUST, 'b', Items.REDSTONE, 'c', items.itemSilicon);
GameRegistry.addShapelessRecipe(new ItemStack(items.neodymiumMagnet), new Object[] { items.neodymium, items.cobalt, items.cobalt });
}
private void addSmelting(ItemHandler items, BlockHandler blocks)
@@ -301,6 +301,7 @@ public Models models()
public final Texture BLUR_GUNSCOPE = new Texture(AliensVsPredator.Properties.ID, "textures/misc/scope.png");
public final Texture GUI_BASIC = new Texture(AliensVsPredator.Properties.ID, "textures/gui/background.png");
public final Texture GUI_TURRET = new Texture(AliensVsPredator.Properties.ID, "textures/gui/turret.png");
public final Texture GUI_NETWORK_RACK = new Texture(AliensVsPredator.Properties.ID, "textures/gui/networkrack.png");
public final Texture GUI_WRISTBRACER = new Texture(AliensVsPredator.Properties.ID, "textures/gui/wristbracer.png");
public final Texture GUI_LOCKER = new Texture(AliensVsPredator.Properties.ID, "textures/gui/locker.png");
public final Texture GUI_ASSEMBLER = new Texture(AliensVsPredator.Properties.ID, "textures/gui/assembler.png");
@@ -1,8 +1,10 @@
package org.avp.client.gui;
import org.avp.AliensVsPredator;
import org.avp.tile.TileEntityNetworkRack;
import com.arisux.mdx.lib.client.render.Draw;
import com.arisux.mdx.lib.client.render.OpenGL;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.EntityPlayer;
@@ -23,24 +25,27 @@ public GuiNetworkRack(EntityPlayer player, TileEntityNetworkRack rack)
@Override
protected void drawGuiContainerBackgroundLayer(float f, int x, int y)
{
drawRect(this.guiLeft, this.guiTop, this.guiLeft + this.xSize, this.guiTop + this.ySize, 0xCC000000);
Draw.drawString(this.rack.inventory.getName(), this.guiLeft + 5, this.guiTop + 5, 0xFFFFFFFF);
Draw.drawResource(AliensVsPredator.resources().GUI_NETWORK_RACK, this.guiLeft, this.guiTop, 256, 256);
for (int idx = 3; idx >= 0; idx--)
{
ItemStack stack = this.rack.inventory.getStackInSlot(idx);
int sW = 16;
int sH = 16;
int sP = 2;
int sX = this.guiLeft + 5;
int sY = this.guiTop + 26 + (sH * idx) + (sP * idx);
drawRect(sX, sY, sX + sW, sY + sH, 0x1AFFFFFF);
int sP = 6;
int sPH = 4;
int sX = this.guiLeft + 26;
int sY = this.guiTop + 19 + (sH * idx) + (sP * idx);
if (stack != null)
{
Draw.drawString(stack.getDisplayName(), sX + sW + (sP * 2), sY + (sH / 4), 0xFFFFFFFF);
float s = 0.5F;
OpenGL.pushMatrix();
OpenGL.scale(s, s, s);
Draw.drawString(stack.getDisplayName(), (sX + sW + (sPH * 2)) * 2, (sY + (sH / 4) + 2) * 2, 0xFFFFFFFF);
OpenGL.popMatrix();
}
}
}
@@ -24,7 +24,7 @@ public GuiRepulsionGenerator(EntityPlayer player, TileEntityRepulsionGenerator g
protected void drawGuiContainerBackgroundLayer(float f, int x, int y)
{
Draw.drawResource(AliensVsPredator.resources().GUI_REPULSION_GENERATOR, this.guiLeft, this.guiTop, 256, 256, 255F, 255F, 255F, 255F, 1F, 1F);
Draw.drawString(this.generator.getProposedSpeed() + "", this.guiLeft, this.guiTop + this.ySize + 10, 0xFFFF0000);
Draw.drawString(this.generator.getRotationSpeed() + "", this.guiLeft, this.guiTop + this.ySize + 20, 0xFFFF0000);
Draw.drawString(Math.round(this.generator.getVoltage()) + "V", this.guiLeft + 50, this.guiTop + this.ySize - 40, 0xFFCC44, false);
Draw.drawString(Math.round(this.generator.getRotationSpeed() * 1000) + " RPM", this.guiLeft + 125, this.guiTop + this.ySize - 40, 0xFFCC44, false);
}
}
@@ -24,12 +24,12 @@ public void initialize()
{
for (byte slot = 0; slot < this.rack.inventory.getSizeInventory(); slot++)
{
addSlotToContainer(new Slot(this.rack.inventory, slot, 5, 26 + (18 * slot)));
addSlotToContainer(new Slot(this.rack.inventory, slot, 26, 19 + (22 * slot)));
}
for (byte slot = 0; slot < 9; slot++)
{
addSlotToContainer(new Slot(player.inventory, slot, 5 + (18 * slot), 182));
addSlotToContainer(new Slot(player.inventory, slot, 8 + (18 * slot), 109));
}
}
@@ -73,6 +73,7 @@ public void fogRenderEvent(RenderFogEvent event)
}
}
@SideOnly(Side.CLIENT)
private void generateStars()
{
Tessellator tessellator = Tessellator.getInstance();
@@ -94,6 +95,7 @@ private void generateStars()
this.starGLCallList += 1;
}
@SideOnly(Side.CLIENT)
private void renderStars(VertexBuffer buffer)
{
Random random = new Random(10842L);
@@ -143,6 +145,7 @@ private void renderStars(VertexBuffer buffer)
Tessellator.getInstance().draw();
}
@SideOnly(Side.CLIENT)
@Override
public void render(float renderPartialTicks, WorldClient world, Minecraft mc)
{
@@ -236,6 +239,7 @@ public void render(float renderPartialTicks, WorldClient world, Minecraft mc)
}
}
@SideOnly(Side.CLIENT)
public void renderClouds(float renderPartialTicks)
{
for (int cloudPass = 1; cloudPass > 0; cloudPass--)
@@ -3,20 +3,18 @@
import org.avp.AliensVsPredator;
import com.arisux.mdx.lib.client.render.Texture;
import com.arisux.mdx.lib.client.render.world.ClimateProvider;
import com.arisux.mdx.lib.client.render.world.IStormProvider;
import com.arisux.mdx.lib.client.render.world.CloudProvider;
import com.arisux.mdx.lib.game.Game;
import com.arisux.mdx.lib.util.MDXMath;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.world.World;
import net.minecraft.world.WorldProvider;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class ClimateProviderVarda extends ClimateProvider
public class CloudProviderVarda extends CloudProvider
{
public StormProviderVarda stormProvider = new StormProviderVarda();
@SideOnly(Side.CLIENT)
@Override
public Texture getCloudTexture()
{
@@ -40,16 +38,4 @@ public double getCloudMovementZ(World world, float cloudTicksPrev, float cloudTi
{
return -MDXMath.interpolateRotation(cloudTicksPrev, cloudTicks, Game.partialTicks());
}
@Override
public void render(float partialTicks, WorldClient world, Minecraft mc)
{
super.render(partialTicks, world, mc);
}
@Override
public IStormProvider getStormProvider()
{
return stormProvider;
}
}
@@ -19,6 +19,8 @@
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraftforge.client.IRenderHandler;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class SkyProviderVarda extends IRenderHandler
{
@@ -100,6 +102,7 @@ private void renderStars(VertexBuffer buffer)
Tessellator.getInstance().draw();
}
@SideOnly(Side.CLIENT)
@Override
public void render(float partialTicks, WorldClient world, Minecraft mc)
{
@@ -9,6 +9,8 @@
import net.minecraft.world.World;
import net.minecraft.world.WorldProvider;
import net.minecraft.world.biome.Biome;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class StormProviderVarda extends StormProvider
{
@@ -54,6 +56,7 @@ public boolean doesLightingApply()
return true;
}
@SideOnly(Side.CLIENT)
@Override
public Texture getStormTexture(World world, Biome biome)
{
@@ -2,6 +2,10 @@
import org.avp.AliensVsPredator;
import com.arisux.mdx.lib.client.render.world.IClimateProvider;
import com.arisux.mdx.lib.client.render.world.ICloudProvider;
import com.arisux.mdx.lib.client.render.world.IStormProvider;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
@@ -14,13 +18,24 @@
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class WorldProviderVarda extends WorldProvider
public class WorldProviderVarda extends WorldProvider implements IClimateProvider
{
@SideOnly(Side.CLIENT)
public ClimateProviderVarda climateProvider = new ClimateProviderVarda();
private StormProviderVarda storm = new StormProviderVarda();
private CloudProviderVarda clouds = new CloudProviderVarda();
private SkyProviderVarda sky;
@Override
public IStormProvider getStormProvider()
{
return storm;
}
@Override
public ICloudProvider getCloudProvider()
{
return clouds;
}
@SideOnly(Side.CLIENT)
private SkyProviderVarda skyProvider;
public WorldProviderVarda()
{
@@ -45,18 +60,19 @@ protected void createBiomeProvider()
this.biomeProvider = new BiomeProviderVarda(this.getSeed(), WorldType.DEFAULT);
}
@Override
@SideOnly(Side.CLIENT)
public IRenderHandler getSkyRenderer()
{
return skyProvider == null ? skyProvider = new SkyProviderVarda() : skyProvider;
return sky == null ? sky = new SkyProviderVarda() : sky;
}
@Override
@SideOnly(Side.CLIENT)
public IRenderHandler getCloudRenderer()
{
return climateProvider;
return (CloudProviderVarda) getCloudProvider();
}
@Override
@@ -1,3 +1,13 @@
# ITEMS-NETWORK RACK MODULES
item.avp:rackmodule1.name=Recorder
item.avp:rackmodule2.name=Management Console
item.avp:rackmodule3.name=Network Transmitter
item.avp:rackmodule4.name=Function Generator
item.avp:rackmodule5.name=Network Receiver
item.avp:rackmodule6.name=Logic Analyzer
item.avp:rackmodule7.name=Network Attached Storage
item.avp:rackmodule8.name=Oscilloscope
# ITEMS-AMMO
item.avp:ammo.pistol.name=Pistol Rounds
item.avp:ammo.ar.name=Assault Rifle Rounds
@@ -7,11 +17,7 @@ item.avp:ammo.sniper.name=Sniper Rounds
item.avp:ammo.flamethrower.name=Flamethrower Fuel
item.avp:grenade.m40.name=M40 Grenade
item.avp:grenade.incindiary.name=M40 Incendiary Grenade
item.avp:tool.celtic.spear.name=Celtic Spear
item.avp:smartdisc.name=Smart Disc
item.avp:shuriken.name=Shuriken
item.avp:artifact.tech.name=Yautja Artifact
item.avp:plasmacannon.name=Plasma Caster
item.avp:chargepack.name=Charge Pack
# ITEMS-ARMOUR
@@ -43,7 +49,14 @@ item.avp:tool.celtic.sword.name=Celtic Sword
item.avp:tool.celtic.hoe.name=Celtic Hoe
item.avp:tool.celtic.axe.name=Celtic Axe
item.avp:tool.celtic.pick.name=Celtic Pickaxe
item.avp:tool.celtic.spear.name=Celtic Spear
item.avp:smartdisc.name=Smart Disc
item.avp:shuriken.name=Shuriken
item.avp:artifact.tech.name=Yautja Artifact
item.avp:plasmacannon.name=Plasma Caster
item.avp:tool.maintenancejack.name=Maintenance Jack
item.avp:tool.securityaccessruner.name=Security Access Tuner
item.avp:stun.baton.name=Stun Baton
# ITEMS-FIREARM COMPONENTS
@@ -75,6 +88,9 @@ item.avp:part.m56sg.aimingmodule.name=M56SG Aiming Module
# ITEMS-MISC
item.avp:neodymium.magnet.name=Neodymium Magnet
item.avp:cobalt.name=Cobalt
item.avp:neodymium.name=Neodymium
item.avp:silicon.name=Silicon
item.avp:polycarbonate.name=Polycarbonate
item.avp:ingot.aluminum.name=Aluminum Ingot
@@ -300,6 +316,8 @@ tile.avp:orecopper.name=Copper Ore
tile.avp:orebauxite.name=Bauxite Ore
tile.avp:oresilicon.name=Silicon Ore
tile.avp:orelithium.name=Lithium Ore
tile.avp:orecobalt.name=Cobalt Ore
tile.avp:oremonazite.name=Monazite Ore
tile.avp:blockBlackGoo.name=Black Goo
tile.avp:blackgoo.name=Black Goo
tile.avp:mist.name=Reactive Mist
@@ -309,6 +327,7 @@ tile.avp:mist.name=Reactive Mist
tile.avp:turret.name=UA 571-E Sentry Turret
tile.avp:stasismechanism.name=Stasis Mechanism
tile.avp:blastdoor.name=Blast Door
tile.avp:blastdoor.sevastopol.name=Blast Door (Sevastopol)
tile.avp:generator.name=Repulsion Generator
tile.avp:powerline.name=Power Cable
tile.avp:terminal.name=Terminal
@@ -317,7 +336,6 @@ tile.avp:powercell.name=Powercell
tile.avp:locker.name=Locker
tile.avp:gunlocker.name=Gun Locker
tile.avp:medpod.name=Medpod
tile.avp:satellitemodem.name=Satellite Modem
tile.avp:satellitedish.name=Satellite Dish
tile.avp:assembler.name=Assembler
tile.avp:cryostasistube.name=Cryostasis Tube
@@ -326,16 +344,17 @@ tile.avp:redstonefluxgenerator.name=Redstone Flux Generator
tile.avp:redstonesensor.name=Redstone Sensor
tile.avp:redstoneemitter.name=Redstone Emitter
tile.avp:universalgenerator.name=Universal Power Converter
tile.avp:ccfltube.name=Fluorescent Light
#BLOCKS-SHAPED
tile.avp:slope.name=Reflective Slope
tile.avp:corner.name=Reflective Corner
tile.avp:invertedcorner.name=Reflective Inverted Corner
tile.avp:ridge.name=Reflective Ridge
tile.avp:pyramid.name=Reflective Pyramid
tile.avp:invertedcorner.name=Reflective Inverted Corner
tile.avp:invertedridge.name=Reflective Inverted Ridge
tile.avp:smartridge.name=Reflective Smart Ridge
tile.avp:smartinvertedridge.name=Reflective Inverted Smart Ridge
tile.avp:invertedpyramid.name=Relfective Inverted Pyramid
#BLOCKS-MISC
Binary file not shown.

0 comments on commit 990e4a5

Please sign in to comment.