Skip to content

Commit

Permalink
Merge pull request #82 from thecodewarrior/master
Browse files Browse the repository at this point in the history 
Thanks for the 1.9.4 update code.  Ill test it, then I'll put it on curse
  • Loading branch information
@Kenkron
Kenkron authored Jun 11, 2016
2 parents 903ab8f + 5a2196a commit 441a938
Show file tree
Hide file tree
Showing 51 changed files with 1,037 additions and 369 deletions.
11 changes: 2 additions & 9 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/*
// For those who want the bleeding edge
buildscript {
repositories {
Expand All @@ -9,16 +8,10 @@ buildscript {
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
}
}
apply plugin: 'net.minecraftforge.gradle.forge'
*/

// for people who want stable
plugins {
id "net.minecraftforge.gradle.forge" version "2.0.2"
}

version = mcversion + '-' + version_major + '.' + version_minor + '.' + version_patch
group= "hunternif.mc.atlas" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
Expand All @@ -37,7 +30,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_20150701"
mappings = "snapshot_20160606"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.

replace '@VERSION@', project.version
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mcversion=1.8
forgeversion=11.14.4.1563
mcversion=1.9.4
forgeversion=12.17.0.1954
version_major=4
version_minor=2
version_patch=10
6 changes: 4 additions & 2 deletions src/main/java/hunternif/mc/atlas/AntiqueAtlasMod.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import hunternif.mc.atlas.ext.DeathWatcher;
import hunternif.mc.atlas.ext.ExtBiomeDataHandler;
import hunternif.mc.atlas.ext.NetherFortressWatcher;
import hunternif.mc.atlas.ext.StructureWatcher;
import hunternif.mc.atlas.ext.VillageWatcher;
import hunternif.mc.atlas.item.ItemAtlas;
import hunternif.mc.atlas.item.ItemEmptyAtlas;
Expand Down Expand Up @@ -66,7 +67,7 @@ public void preInit(FMLPreInitializationEvent event) {
itemAtlas = (ItemAtlas) new ItemAtlas(settings).setUnlocalizedName("antiqueAtlas");

itemEmptyAtlas = (ItemEmptyAtlas) new ItemEmptyAtlas()
.setUnlocalizedName("emptyAntiqueAtlas").setCreativeTab(CreativeTabs.tabTools);
.setUnlocalizedName("emptyAntiqueAtlas").setCreativeTab(CreativeTabs.TOOLS);

GameRegistry.registerItem(itemAtlas, "antiqueAtlas");
GameRegistry.registerItem(itemEmptyAtlas, "emptyAntiqueAtlas");
Expand All @@ -77,7 +78,7 @@ public void init(FMLInitializationEvent event){
PacketDispatcher.registerPackets();
proxy.init(event);

GameRegistry.addShapelessRecipe(new ItemStack(itemEmptyAtlas), Items.book, Items.compass);
GameRegistry.addShapelessRecipe(new ItemStack(itemEmptyAtlas), Items.BOOK, Items.COMPASS);

RecipeSorter.register("antiqueatlas:atlascloning", RecipeAtlasCloning.class, SHAPELESS, "after:minecraft:shapeless");
GameRegistry.addRecipe(new RecipeAtlasCloning());
Expand All @@ -98,6 +99,7 @@ public void init(FMLInitializationEvent event){

MinecraftForge.EVENT_BUS.register(new DeathWatcher());

MinecraftForge.EVENT_BUS.register(new StructureWatcher("EndCity", 1, "EndCity_Far", "gui.antiqueatlas.marker.endcity").setTileMarker("EndCity", "gui.antiqueatlas.marker.endcity"));
MinecraftForge.EVENT_BUS.register(new VillageWatcher());
MinecraftForge.EVENT_BUS.register(new NetherFortressWatcher());
MinecraftForge.EVENT_BUS.register(new NetherPortalWatcher());
Expand Down
212 changes: 130 additions & 82 deletions src/main/java/hunternif/mc/atlas/ClientProxy.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,29 @@
package hunternif.mc.atlas;

import static hunternif.mc.atlas.client.TextureSet.*;
import static net.minecraft.world.biome.BiomeGenBase.*;

import java.io.File;

import net.minecraftforge.fml.client.FMLClientHandler;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;

import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Biomes;
import net.minecraft.item.ItemStack;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.IThreadListener;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.biome.Biome;

import hunternif.mc.atlas.client.BiomeTextureConfig;
import hunternif.mc.atlas.client.BiomeTextureMap;
import hunternif.mc.atlas.client.TextureSet;
Expand All @@ -15,27 +37,10 @@
import hunternif.mc.atlas.ext.VillageWatcher;
import hunternif.mc.atlas.marker.MarkerTextureConfig;
import hunternif.mc.atlas.marker.MarkerTextureMap;
import hunternif.mc.atlas.marker.MarkerTypeData;
import hunternif.mc.atlas.marker.NetherPortalWatcher;
import hunternif.mc.atlas.util.Log;

import java.io.File;

import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IThreadListener;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;

public class ClientProxy extends CommonProxy {
private TextureSetMap textureSetMap;
private TextureSetConfig textureSetConfig;
Expand All @@ -48,6 +53,11 @@ public class ClientProxy extends CommonProxy {

private GuiAtlas guiAtlas;

@Override
public MinecraftServer getServer() {
return FMLClientHandler.instance().getServer();
}

@Override
public void preInit(FMLPreInitializationEvent event) {
super.preInit(event);
Expand Down Expand Up @@ -211,73 +221,78 @@ private void registerDefaultTextureSets(TextureSetMap map) {
map.register(NETHER_HALL);
map.register(NETHER_FORT_STAIRS);
map.register(NETHER_THRONE);

map.register(END_ISLAND);
map.register(END_ISLAND_PLANTS);
map.register(END_VOID);
}

/** Assign default textures to vanilla biomes. The textures are assigned
* only if the biome was not in the config. This prevents unnecessary
* overwriting, to aid people who manually modify the config. */
private void assignVanillaBiomeTextures() {
setBiomeTextureIfNone(ocean, WATER);
setBiomeTextureIfNone(deepOcean, WATER);
setBiomeTextureIfNone(river, WATER);
setBiomeTextureIfNone(frozenOcean, ICE);
setBiomeTextureIfNone(frozenRiver, ICE);
setBiomeTextureIfNone(beach, SHORE);
setBiomeTextureIfNone(coldBeach, SHORE);
setBiomeTextureIfNone(stoneBeach, ROCK_SHORE);
setBiomeTextureIfNone(desert, DESERT);
setBiomeTextureIfNone(desert.biomeID + 128, DESERT);
setBiomeTextureIfNone(desertHills, DESERT_HILLS);
setBiomeTextureIfNone(plains, PLAINS);
setBiomeTextureIfNone(plains.biomeID + 128, SUNFLOWERS);
setBiomeTextureIfNone(icePlains, SNOW);
setBiomeTextureIfNone(icePlains.biomeID + 128, ICE_SPIKES); // this is a biome mutation
setBiomeTextureIfNone(iceMountains, SNOW_HILLS);
setBiomeTextureIfNone(extremeHills, MOUNTAINS);
setBiomeTextureIfNone(extremeHillsEdge, MOUNTAINS);
setBiomeTextureIfNone(extremeHills.biomeID + 128, MOUNTAINS_SNOW_CAPS);
setBiomeTextureIfNone(extremeHillsPlus, MOUNTAINS_ALL);
setBiomeTextureIfNone(extremeHillsPlus.biomeID + 128, MOUNTAINS_SNOW_CAPS);
setBiomeTextureIfNone(forest, FOREST);
setBiomeTextureIfNone(forest.biomeID + 128, FOREST_FLOWERS);
setBiomeTextureIfNone(forestHills, FOREST_HILLS);
setBiomeTextureIfNone(roofedForest, DENSE_FOREST);
setBiomeTextureIfNone(roofedForest.biomeID + 128, DENSE_FOREST_HILLS); //TODO roofed forest M has steeper cliffs
setBiomeTextureIfNone(birchForest, BIRCH);
setBiomeTextureIfNone(birchForest.biomeID + 128, TALL_BIRCH);
setBiomeTextureIfNone(birchForestHills, BIRCH_HILLS);
setBiomeTextureIfNone(birchForestHills.biomeID + 128, TALL_BIRCH_HILLS);
setBiomeTextureIfNone(jungle, JUNGLE);
setBiomeTextureIfNone(jungle.biomeID + 128, JUNGLE_CLIFFS);
setBiomeTextureIfNone(jungleHills, JUNGLE_HILLS);
setBiomeTextureIfNone(jungleEdge, JUNGLE_EDGE);
setBiomeTextureIfNone(jungleEdge.biomeID + 128, JUNGLE_EDGE_HILLS);
setBiomeTextureIfNone(taiga, PINES);
setBiomeTextureIfNone(taiga.biomeID + 128, PINES_HILLS);
setBiomeTextureIfNone(taigaHills, PINES_HILLS);
setBiomeTextureIfNone(coldTaiga, SNOW_PINES);
setBiomeTextureIfNone(coldTaiga.biomeID + 128, SNOW_PINES_HILLS);
setBiomeTextureIfNone(coldTaigaHills, SNOW_PINES_HILLS);
setBiomeTextureIfNone(megaTaiga, MEGA_TAIGA);
setBiomeTextureIfNone(megaTaiga.biomeID + 128, MEGA_SPRUCE);
setBiomeTextureIfNone(megaTaigaHills, MEGA_TAIGA_HILLS);
setBiomeTextureIfNone(megaTaigaHills.biomeID + 128, MEGA_SPRUCE_HILLS);
setBiomeTextureIfNone(swampland, SWAMP);
setBiomeTextureIfNone(swampland.biomeID + 128, SWAMP_HILLS);
setBiomeTextureIfNone(sky, SHORE);
setBiomeTextureIfNone(hell, CAVE_WALLS);
setBiomeTextureIfNone(mushroomIsland, MUSHROOM);
setBiomeTextureIfNone(mushroomIslandShore, SHORE);
setBiomeTextureIfNone(savanna, SAVANNA);
setBiomeTextureIfNone(savanna.biomeID + 128, SAVANNA_CLIFFS);
setBiomeTextureIfNone(mesa, MESA);
setBiomeTextureIfNone(mesa.biomeID + 128, BRYCE);
setBiomeTextureIfNone(mesaPlateau, PLATEAU_MESA);
setBiomeTextureIfNone(mesaPlateau_F, PLATEAU_MESA_TREES);
setBiomeTextureIfNone(mesaPlateau.biomeID + 128, PLATEAU_MESA_LOW);
setBiomeTextureIfNone(mesaPlateau_F.biomeID + 128, PLATEAU_MESA_TREES_LOW);
setBiomeTextureIfNone(savannaPlateau, PLATEAU_SAVANNA);
setBiomeTextureIfNone(savannaPlateau.biomeID + 128, PLATEAU_SAVANNA_M);
setBiomeTextureIfNone(Biomes.OCEAN, WATER);
setBiomeTextureIfNone(Biomes.DEEP_OCEAN, WATER);
setBiomeTextureIfNone(Biomes.RIVER, WATER); //
setBiomeTextureIfNone(Biomes.FROZEN_OCEAN, ICE);
setBiomeTextureIfNone(Biomes.FROZEN_RIVER, ICE);
setBiomeTextureIfNone(Biomes.BEACH, SHORE);
setBiomeTextureIfNone(Biomes.COLD_BEACH, SHORE);
setBiomeTextureIfNone(Biomes.STONE_BEACH, ROCK_SHORE);
setBiomeTextureIfNone(Biomes.DESERT, DESERT);
setBiomeTextureIfNone(Biomes.MUTATED_DESERT, DESERT);
setBiomeTextureIfNone(Biomes.DESERT_HILLS, DESERT_HILLS);
setBiomeTextureIfNone(Biomes.PLAINS, PLAINS);
setBiomeTextureIfNone(Biomes.MUTATED_PLAINS, SUNFLOWERS);
setBiomeTextureIfNone(Biomes.ICE_PLAINS, SNOW);
setBiomeTextureIfNone(Biomes.MUTATED_ICE_FLATS, ICE_SPIKES); // this is a biome mutation
setBiomeTextureIfNone(Biomes.ICE_MOUNTAINS, SNOW_HILLS);
setBiomeTextureIfNone(Biomes.EXTREME_HILLS, MOUNTAINS);
setBiomeTextureIfNone(Biomes.EXTREME_HILLS_EDGE, MOUNTAINS);
setBiomeTextureIfNone(Biomes.MUTATED_EXTREME_HILLS, MOUNTAINS_SNOW_CAPS);
setBiomeTextureIfNone(Biomes.EXTREME_HILLS_WITH_TREES, MOUNTAINS_ALL);
setBiomeTextureIfNone(Biomes.MUTATED_EXTREME_HILLS_WITH_TREES, MOUNTAINS_SNOW_CAPS);
setBiomeTextureIfNone(Biomes.FOREST, FOREST);
setBiomeTextureIfNone(Biomes.MUTATED_FOREST, FOREST_FLOWERS);
setBiomeTextureIfNone(Biomes.FOREST_HILLS, FOREST_HILLS);
setBiomeTextureIfNone(Biomes.ROOFED_FOREST, DENSE_FOREST);
setBiomeTextureIfNone(Biomes.MUTATED_ROOFED_FOREST, DENSE_FOREST_HILLS); //TODO roofed forest M has steeper cliffs
setBiomeTextureIfNone(Biomes.BIRCH_FOREST, BIRCH);
setBiomeTextureIfNone(Biomes.MUTATED_BIRCH_FOREST, TALL_BIRCH);
setBiomeTextureIfNone(Biomes.BIRCH_FOREST_HILLS, BIRCH_HILLS);
setBiomeTextureIfNone(Biomes.MUTATED_BIRCH_FOREST_HILLS, TALL_BIRCH_HILLS);
setBiomeTextureIfNone(Biomes.JUNGLE, JUNGLE);
setBiomeTextureIfNone(Biomes.MUTATED_JUNGLE, JUNGLE_CLIFFS);
setBiomeTextureIfNone(Biomes.JUNGLE_HILLS, JUNGLE_HILLS);
setBiomeTextureIfNone(Biomes.JUNGLE_EDGE, JUNGLE_EDGE);
setBiomeTextureIfNone(Biomes.MUTATED_JUNGLE_EDGE, JUNGLE_EDGE_HILLS);
setBiomeTextureIfNone(Biomes.TAIGA, PINES);
setBiomeTextureIfNone(Biomes.MUTATED_TAIGA, PINES_HILLS);
setBiomeTextureIfNone(Biomes.TAIGA_HILLS, PINES_HILLS);
setBiomeTextureIfNone(Biomes.COLD_TAIGA, SNOW_PINES);
setBiomeTextureIfNone(Biomes.MUTATED_TAIGA_COLD, SNOW_PINES_HILLS);
setBiomeTextureIfNone(Biomes.COLD_TAIGA_HILLS, SNOW_PINES_HILLS);
setBiomeTextureIfNone(Biomes.REDWOOD_TAIGA, MEGA_TAIGA);
setBiomeTextureIfNone(Biomes.MUTATED_REDWOOD_TAIGA, MEGA_SPRUCE);
setBiomeTextureIfNone(Biomes.REDWOOD_TAIGA_HILLS, MEGA_TAIGA_HILLS);
setBiomeTextureIfNone(Biomes.MUTATED_REDWOOD_TAIGA_HILLS, MEGA_SPRUCE_HILLS);
setBiomeTextureIfNone(Biomes.SWAMPLAND, SWAMP);
setBiomeTextureIfNone(Biomes.MUTATED_SWAMPLAND, SWAMP_HILLS);
setBiomeTextureIfNone(Biomes.SKY, SHORE);
setBiomeTextureIfNone(Biomes.HELL, CAVE_WALLS);
setBiomeTextureIfNone(Biomes.VOID, END_VOID);
setBiomeTextureIfNone(Biomes.MUSHROOM_ISLAND, MUSHROOM);
setBiomeTextureIfNone(Biomes.MUSHROOM_ISLAND_SHORE, SHORE);
setBiomeTextureIfNone(Biomes.SAVANNA, SAVANNA);
setBiomeTextureIfNone(Biomes.MUTATED_SAVANNA, SAVANNA_CLIFFS);
setBiomeTextureIfNone(Biomes.MESA, MESA);
setBiomeTextureIfNone(Biomes.MUTATED_MESA, BRYCE);
setBiomeTextureIfNone(Biomes.MESA_CLEAR_ROCK, PLATEAU_MESA);
setBiomeTextureIfNone(Biomes.MESA_ROCK, PLATEAU_MESA_TREES);
setBiomeTextureIfNone(Biomes.MUTATED_MESA_CLEAR_ROCK, PLATEAU_MESA_LOW);
setBiomeTextureIfNone(Biomes.MUTATED_MESA_ROCK, PLATEAU_MESA_TREES_LOW);
setBiomeTextureIfNone(Biomes.SAVANNA_PLATEAU, PLATEAU_SAVANNA);
setBiomeTextureIfNone(Biomes.MUTATED_SAVANNA_ROCK, PLATEAU_SAVANNA_M);
}
/** Only applies the change if no texture is registered for this biome.
* This prevents overwriting of the config when there is no real change. */
Expand All @@ -286,10 +301,12 @@ private void setBiomeTextureIfNone(int biomeID, TextureSet textureSet) {
biomeTextureMap.setTexture(biomeID, textureSet);
}
}
private void setBiomeTextureIfNone(BiomeGenBase biome, TextureSet textureSet) {
setBiomeTextureIfNone(biome.biomeID, textureSet);
private void setBiomeTextureIfNone(Biome biome, TextureSet textureSet) {
setBiomeTextureIfNone(Biome.getIdForBiome(biome), textureSet);
}

MarkerTypeData dummyData = new MarkerTypeData(true, false, false);

/** Load default marker textures. */
private void registerDefaultMarkers() {;
setMarkerTextureIfNone("google", Textures.MARKER_GOOGLE_MARKER);
Expand All @@ -305,6 +322,20 @@ private void setBiomeTextureIfNone(BiomeGenBase biome, TextureSet textureSet) {
setMarkerTextureIfNone("tower", Textures.MARKER_TOWER);
setMarkerTextureIfNone("scroll", Textures.MARKER_SCROLL);
setMarkerTextureIfNone("tomb", Textures.MARKER_TOMB);

MarkerTypeData data;

setMarkerTextureIfNone("EndCity", Textures.MARKER_END_CITY);
data = createMarkerDataOrGetDummy("EndCity");
data.setShowAsTileData(4, 0, -1.5f, 64, Textures.MARKER_END_CITY_MIP_32, Textures.MARKER_END_CITY_MIP_16);
data.setShowAsTile(true).setShouldClip(true).setClip(-2, 1000);

setMarkerTextureIfNone("EndCity_Far", Textures.MARKER_END_CITY_FAR);
data = createMarkerDataOrGetDummy("EndCity_Far");
data.setShouldClip(true).setClip(-100, -2);

data = createMarkerDataOrGetDummy(VillageWatcher.MARKER);
data.setShouldClip(true).setClip(-100, -1);
}
/** Only applies the change if no texture is registered for this marker type.
* This prevents overwriting of the config when there is no real change. */
Expand All @@ -314,6 +345,19 @@ private void setMarkerTextureIfNone(String markerType, ResourceLocation texture)
}
}

/**
* Creates and returns a MarkerTypeData if it hasn't been loaded
* or returns a dummy MarkerTypeData that isn't linked to any type
*/
private MarkerTypeData createMarkerDataOrGetDummy(String markerType) {
MarkerTypeData data = dummyData;
if (!markerTextureMap.hasTileData(markerType)) {
data = new MarkerTypeData(true, false, false);
markerTextureMap.setMarkerTypeData(markerType, data);
}
return data;
}

/** Assign default textures to the pseudo-biomes used for vanilla Minecraft.
* The pseudo-biomes are: villages houses, village territory and lava. */
private void registerVanillaCustomTileTextures() {
Expand Down Expand Up @@ -346,6 +390,10 @@ private void registerVanillaCustomTileTextures() {
setCustomTileTextureIfNone(ExtTileIdMap.TILE_NETHER_HALL, NETHER_HALL);
setCustomTileTextureIfNone(ExtTileIdMap.TILE_NETHER_FORT_STAIRS, NETHER_FORT_STAIRS);
setCustomTileTextureIfNone(ExtTileIdMap.TILE_NETHER_THRONE, NETHER_THRONE);

setCustomTileTextureIfNone(ExtTileIdMap.TILE_END_ISLAND, END_ISLAND);
setCustomTileTextureIfNone(ExtTileIdMap.TILE_END_ISLAND_PLANTS, END_ISLAND_PLANTS);
setCustomTileTextureIfNone(ExtTileIdMap.TILE_END_VOID, END_VOID);
}
/** Only applies the change if no texture is registered for this tile name.
* This prevents overwriting of the config when there is no real change. */
Expand Down
Loading

0 comments on commit 441a938

Please sign in to comment.