Skip to content

Update to 1.8.9 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
61352151511 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update to 1.8.9 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e0bdea
Update to 1.8.8
Dec 19, 2015
a1a4ba0
1.8.9
Dec 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,34 @@
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.
// snapshot_YYYYMMDD snapshot are built nightly.
// 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 {
Expand Down
1 change: 1 addition & 0 deletions renderTo 1.8.9_Client.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"><stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStart"/><stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="renderTo 1.8.9"/><stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\Users\Mitch\Central Storage\eclipseworkspace\renderTo 1.8.9\eclipse"/></launchConfiguration>
1 change: 1 addition & 0 deletions renderTo 1.8.9_Server.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication"><stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="GradleStartServer"/><stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="renderTo 1.8.9"/><stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\Users\Mitch\Central Storage\eclipseworkspace\renderTo 1.8.9\eclipse"/></launchConfiguration>
6 changes: 3 additions & 3 deletions src/main/java/me/herbix/renderto/RenderToMod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public Map<String, Entity> 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);

Expand Down Expand Up @@ -133,11 +133,11 @@ public Map<String, Entity> 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);
Expand Down
15 changes: 8 additions & 7 deletions src/main/java/me/herbix/renderto/gui/ItemScrollingList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
}

Expand Down
11 changes: 6 additions & 5 deletions src/main/java/me/herbix/renderto/gui/RenderToGuiScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -696,12 +697,12 @@ private void setupBlockList() {
FMLControlledNamespacedRegistry<Block> 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<IBlockState> states = block.getBlockState().getValidStates();
if(states.size() == 1) {
if(checkMatches(blockName, currentFilterPattern)) {
Expand Down Expand Up @@ -731,12 +732,12 @@ private void setupItemList() {
String domain = domainListModel.get(domainListSelection) + ":";
FMLControlledNamespacedRegistry<Item> 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<ItemStack> itemStacks = new ArrayList<ItemStack>();
item.getSubItems(item, item.getCreativeTab(), itemStacks);
Expand All @@ -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)));
}
}
}
Expand Down