diff --git a/build.gradle b/build.gradle index f8c0291..a18aba5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,28 +1,26 @@ buildscript { repositories { - mavenCentral() + jcenter() maven { name = "forge" url = "http://files.minecraftforge.net/maven" } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' } } -apply plugin: 'forge' +apply plugin: 'net.minecraftforge.gradle.forge' +apply plugin: 'maven' +apply plugin: 'eclipse' -version = "0.4.2" +version = "0.5.0" group= "me.herbix.renderto" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "RenderTo" minecraft { - version = "1.8-11.14.1.1334" + version = "1.8.9-11.15.0.1659" runDir = "eclipse" // the mappings can be changed at any time, and must be in the following format. @@ -30,7 +28,7 @@ minecraft { // stable_# stables are built at the discretion of the MCP team. // Use non-default mappings at your own risk. they may not allways work. // simply re-run your setup task after changing the mappings to update your workspace. - mappings = "snapshot_20141130" + mappings = "snapshot_20151230" } dependencies { diff --git a/renderTo 1.8.9_Client.launch b/renderTo 1.8.9_Client.launch new file mode 100644 index 0000000..a25a45d --- /dev/null +++ b/renderTo 1.8.9_Client.launch @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/renderTo 1.8.9_Server.launch b/renderTo 1.8.9_Server.launch new file mode 100644 index 0000000..66ceb4f --- /dev/null +++ b/renderTo 1.8.9_Server.launch @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/main/java/me/herbix/renderto/RenderToMod.java b/src/main/java/me/herbix/renderto/RenderToMod.java index 634bf27..b3acd6c 100644 --- a/src/main/java/me/herbix/renderto/RenderToMod.java +++ b/src/main/java/me/herbix/renderto/RenderToMod.java @@ -76,7 +76,7 @@ public Map getModEntityEntry(World world) { DifficultyInstance difficulty = world.getDifficultyForLocation(new BlockPos(0, 0, 0)); EntityPigZombie entityPigMan = new EntityPigZombie(world); - entityPigMan.func_180482_a(difficulty, null); + entityPigMan.onInitialSpawn(difficulty, null); entityPigMan.setChild(false); result.put("PigZombie", entityPigMan); @@ -133,11 +133,11 @@ public Map getModEntityEntry(World world) { result.put("Slime:Small", entitySlime); EntityGhast entityGhast = new EntityGhast(world); - entityGhast.func_175454_a(false); + entityGhast.setAttacking(false); result.put("Ghast:Normal", entityGhast); entityGhast = new EntityGhast(world); - entityGhast.func_175454_a(true); + entityGhast.setAttacking(true); result.put("Ghast:Shooting", entityGhast); EntityVillager entityVillager = new EntityVillager(world); diff --git a/src/main/java/me/herbix/renderto/gui/ItemScrollingList.java b/src/main/java/me/herbix/renderto/gui/ItemScrollingList.java index 42aeb5d..6ac84f3 100644 --- a/src/main/java/me/herbix/renderto/gui/ItemScrollingList.java +++ b/src/main/java/me/herbix/renderto/gui/ItemScrollingList.java @@ -6,6 +6,7 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraftforge.fml.client.GuiScrollingList; import org.lwjgl.input.Mouse; @@ -81,13 +82,13 @@ private void overlayBackground(int p_22239_1_, int p_22239_2_, int p_22239_3_, i parent.mc.renderEngine.bindTexture(Gui.optionsBackground); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); float var6 = 32.0F; - worldr.startDrawingQuads(); - worldr.setColorRGBA_I(4210752, p_22239_4_); - worldr.addVertexWithUV(0.0D, p_22239_2_, 0.0D, 0.0D, p_22239_2_ / var6); - worldr.addVertexWithUV((double)this.listWidth + 30, p_22239_2_, 0.0D, (this.listWidth + 30) / var6, p_22239_2_ / var6); - worldr.setColorRGBA_I(4210752, p_22239_3_); - worldr.addVertexWithUV((double)this.listWidth + 30, p_22239_1_, 0.0D, (this.listWidth + 30) / var6, p_22239_1_ / var6); - worldr.addVertexWithUV(0.0D, p_22239_1_, 0.0D, 0.0D, p_22239_1_ / var6); + worldr.begin(7, DefaultVertexFormats.POSITION_TEX_NORMAL); + worldr.color(64, 64, 64, p_22239_4_); + worldr.pos(0.0D, p_22239_2_, 0.0D).tex(0.0D, p_22239_2_ / var6); + worldr.pos((double)this.listWidth + 30, p_22239_2_, 0.0D).tex((this.listWidth + 30) / var6, p_22239_2_ / var6); + worldr.color(64, 64, 64, p_22239_3_); + worldr.pos((double)this.listWidth + 30, p_22239_1_, 0.0D).tex((this.listWidth + 30) / var6, p_22239_1_ / var6); + worldr.pos(0.0D, p_22239_1_, 0.0D).tex(0.0D, p_22239_1_ / var6); var5.draw(); } diff --git a/src/main/java/me/herbix/renderto/gui/RenderToGuiScreen.java b/src/main/java/me/herbix/renderto/gui/RenderToGuiScreen.java index c6dc5fd..c0a8919 100644 --- a/src/main/java/me/herbix/renderto/gui/RenderToGuiScreen.java +++ b/src/main/java/me/herbix/renderto/gui/RenderToGuiScreen.java @@ -46,6 +46,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fml.client.config.GuiCheckBox; import net.minecraftforge.fml.client.config.GuiSlider; @@ -696,12 +697,12 @@ private void setupBlockList() { FMLControlledNamespacedRegistry r1 = GameData.getBlockRegistry(); cachedBlocks.clear(); - for(Object keyobj : r1.getKeys()) { + for(ResourceLocation keyobj : r1.getKeys()) { String name = keyobj.toString(); int index = name.indexOf(':'); if((index < 0 && domain.equals("minecraft:")) || name.startsWith(domain)) { String blockName = index < 0 ? name : name.substring(index + 1); - Block block = r1.getObject(name); + Block block = r1.getObject(keyobj); List states = block.getBlockState().getValidStates(); if(states.size() == 1) { if(checkMatches(blockName, currentFilterPattern)) { @@ -731,12 +732,12 @@ private void setupItemList() { String domain = domainListModel.get(domainListSelection) + ":"; FMLControlledNamespacedRegistry r1 = GameData.getItemRegistry(); cachedItems.clear(); - for(Object keyobj : r1.getKeys()) { + for(ResourceLocation keyobj : r1.getKeys()) { String name = keyobj.toString(); int index = name.indexOf(':'); if((index < 0 && domain.equals("minecraft:")) || name.startsWith(domain)) { String fillName = index < 0 ? name : name.substring(index + 1); - Item item = r1.getObject(name); + Item item = r1.getObject(keyobj); if(item.getHasSubtypes()) { List itemStacks = new ArrayList(); item.getSubItems(item, item.getCreativeTab(), itemStacks); @@ -751,7 +752,7 @@ private void setupItemList() { } else { if(checkMatches(fillName, currentFilterPattern)) { itemListModel.add(fillName); - cachedItems.put(fillName, new ItemStack(r1.getObject(name))); + cachedItems.put(fillName, new ItemStack(r1.getObject(keyobj))); } } }