Changes to remain compatible with Forge refactoring

CyclopsMC · Mar 27, 2016 · b0df023 · b0df023
1 parent 7f8a938
commit b0df023
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 22 deletions.
diff --git a/build.properties b/build.properties
@@ -1,5 +1,5 @@
-mod_version=0.5.3
+mod_version=0.5.4
 minecraft_version=1.9
-forge_version=12.16.0.1767-1.9
+forge_version=12.16.0.1811-1.9
 mcp_mappings_version=snapshot_20160312
 release_type=release
diff --git a/src/main/java/org/cyclops/cyclopscore/Reference.java b/src/main/java/org/cyclops/cyclopscore/Reference.java
@@ -23,6 +23,6 @@ public final class Reference {
 
     // Dependencies
     public static final String MOD_DEPENDENCIES =
-              "required-after:Forge@[12.16.0.1767,);";
+              "required-after:Forge@[12.16.0.1811,);";
 
 }
diff --git a/src/main/java/org/cyclops/cyclopscore/client/icon/IconProvider.java b/src/main/java/org/cyclops/cyclopscore/client/icon/IconProvider.java
@@ -41,7 +41,7 @@ protected TextureAtlasSprite registerIcon(TextureMap textureMap, String location
     @SubscribeEvent
     public void onPreTextureStitch(TextureStitchEvent.Pre event) {
         for(Pair<Pair<Object, Field>, String> entry : toRegister) {
-            TextureAtlasSprite icon = registerIcon(event.map, entry.getValue());
+            TextureAtlasSprite icon = registerIcon(event.getMap(), entry.getValue());
             Object object = entry.getLeft().getLeft();
             Field field = entry.getLeft().getRight();
             try {

diff --git a/src/main/java/org/cyclops/cyclopscore/client/model/DynamicBaseModel.java b/src/main/java/org/cyclops/cyclopscore/client/model/DynamicBaseModel.java
@@ -13,7 +13,7 @@
 import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.client.model.Attributes;
 import net.minecraftforge.client.model.IPerspectiveAwareModel;
-import net.minecraftforge.client.model.TRSRTransformation;
+import net.minecraftforge.common.model.TRSRTransformation;
 import org.apache.commons.lang3.tuple.Pair;
 import org.cyclops.cyclopscore.helper.Helpers;
 import org.lwjgl.util.Color;

diff --git a/src/main/java/org/cyclops/cyclopscore/config/ConfigProperty.java b/src/main/java/org/cyclops/cyclopscore/config/ConfigProperty.java
@@ -201,7 +201,7 @@ public void save(Configuration config, boolean forceUpdate) {
             if(forceUpdate) {
             	additionalProperty.setValue((Integer)value);
             }
-            additionalProperty.comment = getComment();
+            additionalProperty.setComment(getComment());
             if(forceUpdate) {
                 getCallback().run((Integer)value);
             } else {
@@ -217,7 +217,7 @@ public void save(Configuration config, boolean forceUpdate) {
             if(forceUpdate) {
             	additionalProperty.setValue((Boolean)value);
             }
-            additionalProperty.comment = getComment();
+            additionalProperty.setComment(getComment());
             if(forceUpdate) {
                 getCallback().run((Boolean)value);
             } else {
@@ -234,7 +234,7 @@ public void save(Configuration config, boolean forceUpdate) {
             if(forceUpdate) {
             	additionalProperty.setValue((Double)value);
             }
-            additionalProperty.comment = getComment();
+            additionalProperty.setComment(getComment());
             if(forceUpdate) {
                 getCallback().run((Double)value);
             } else {
@@ -250,7 +250,7 @@ public void save(Configuration config, boolean forceUpdate) {
             if(forceUpdate) {
             	additionalProperty.setValue((String)value);
             }
-            additionalProperty.comment = getComment();
+            additionalProperty.setComment(getComment());
             if(forceUpdate) {
                 getCallback().run((String)value);
             } else {
@@ -266,7 +266,7 @@ public void save(Configuration config, boolean forceUpdate) {
                 if(forceUpdate) {
                 	additionalProperty.setValues((String[])value);
                 }
-                additionalProperty.comment = getComment();
+                additionalProperty.setComment(getComment());
                 if(forceUpdate) {
                     getCallback().run((String[])value);
                 } else {
@@ -282,7 +282,7 @@ public void save(Configuration config, boolean forceUpdate) {
             if(forceUpdate) {
                 additionalProperty.setValues((int[])value);
             }
-            additionalProperty.comment = getComment();
+            additionalProperty.setComment(getComment());
             if(forceUpdate) {
                 getCallback().run((int[])value);
             } else {

diff --git a/...n/java/org/cyclops/cyclopscore/config/configurable/ConfigurableBlockConnectedTexture.java b/...n/java/org/cyclops/cyclopscore/config/configurable/ConfigurableBlockConnectedTexture.java
@@ -102,7 +102,7 @@ public TextureAtlasSprite getTexture(String name) {
     @SideOnly(Side.CLIENT)
     public void onPreTextureStitch(TextureStitchEvent.Pre event) {
         for(Map.Entry<String, ResourceLocation> textureEntry : textureMap.entrySet()) {
-            loadedTextureMap.put(textureEntry.getKey(), event.map.registerSprite(textureEntry.getValue()));
+            loadedTextureMap.put(textureEntry.getKey(), event.getMap().registerSprite(textureEntry.getValue()));
         }
     }
 

diff --git a/src/main/java/org/cyclops/cyclopscore/config/configurable/ConfigurablePotion.java b/src/main/java/org/cyclops/cyclopscore/config/configurable/ConfigurablePotion.java
@@ -77,7 +77,7 @@ public int getAmplifier(EntityLivingBase entity) {
 
     @SubscribeEvent
     public void onEntityUpdate(LivingEvent.LivingUpdateEvent event) {
-        EntityLivingBase entity = event.entityLiving;
+        EntityLivingBase entity = event.getEntityLiving();
         if(isActiveOn(entity)) {
             onUpdate(entity);
         }

diff --git a/src/main/java/org/cyclops/cyclopscore/config/configurabletypeaction/BiomeAction.java b/src/main/java/org/cyclops/cyclopscore/config/configurabletypeaction/BiomeAction.java
@@ -19,7 +19,7 @@ public void preRun(BiomeConfig eConfig, Configuration config, boolean startup) {
         Property property = config.get(eConfig.getHolderType().getCategory(), eConfig.getNamedId(), eConfig.isEnabled());
         property.setRequiresWorldRestart(true);
         property.setRequiresMcRestart(true);
-        property.comment = eConfig.getComment();
+        property.setComment(eConfig.getComment());
 
         if(startup) {
             // Update the ID, it could've changed

diff --git a/src/main/java/org/cyclops/cyclopscore/config/configurabletypeaction/BlockAction.java b/src/main/java/org/cyclops/cyclopscore/config/configurabletypeaction/BlockAction.java
@@ -63,7 +63,7 @@ public void preRun(BlockConfig eConfig, Configuration config, boolean startup) {
         Property property = config.get(eConfig.getHolderType().getCategory(), eConfig.getNamedId(),
         		eConfig.isEnabled());
         property.setRequiresMcRestart(true);
-        property.comment = eConfig.getComment();
+        property.setComment(eConfig.getComment());
 
         if(startup) {
 	        // Update the ID, it could've changed

diff --git a/src/main/java/org/cyclops/cyclopscore/config/configurabletypeaction/EnchantmentAction.java b/src/main/java/org/cyclops/cyclopscore/config/configurabletypeaction/EnchantmentAction.java
@@ -18,7 +18,7 @@ public void preRun(EnchantmentConfig eConfig, Configuration config, boolean star
         // Get property in config file and set comment
         Property property = config.get(eConfig.getHolderType().getCategory(), eConfig.getNamedId(), eConfig.isEnabled());
         property.setRequiresMcRestart(true);
-        property.comment = eConfig.getComment();
+        property.setComment(eConfig.getComment());
 
         if(startup) {
 	        // Update the ID, it could've changed

diff --git a/src/main/java/org/cyclops/cyclopscore/config/configurabletypeaction/ItemAction.java b/src/main/java/org/cyclops/cyclopscore/config/configurabletypeaction/ItemAction.java
@@ -47,7 +47,7 @@ public void preRun(ItemConfig eConfig, Configuration config, boolean startup) {
         Property property = config.get(eConfig.getHolderType().getCategory(), eConfig.getNamedId(),
         		eConfig.isEnabled());
         property.setRequiresMcRestart(true);
-        property.comment = eConfig.getComment();
+        property.setComment(eConfig.getComment());
 
         if(startup) {
 	        // Update the ID, it could've changed

diff --git a/src/main/java/org/cyclops/cyclopscore/config/configurabletypeaction/PotionAction.java b/src/main/java/org/cyclops/cyclopscore/config/configurabletypeaction/PotionAction.java
@@ -18,7 +18,7 @@ public void preRun(PotionConfig eConfig, Configuration config, boolean startup)
         // Get property in config file and set comment
         Property property = config.get(eConfig.getHolderType().getCategory(), eConfig.getNamedId(), eConfig.isEnabled());
         property.setRequiresMcRestart(true);
-        property.comment = eConfig.getComment();
+        property.setComment(eConfig.getComment());
 
         if(startup) {
             // Update the ID, it could've changed

diff --git a/src/main/java/org/cyclops/cyclopscore/event/ConfigChangedEventHook.java b/src/main/java/org/cyclops/cyclopscore/event/ConfigChangedEventHook.java
@@ -23,7 +23,7 @@ public ConfigChangedEventHook(ModBase mod) {
      */
     @SubscribeEvent
     public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent eventArgs) {
-        if(eventArgs.modID.equals(mod.getModId())) {
+        if(eventArgs.getModID().equals(mod.getModId())) {
         	mod.getConfigHandler().syncProcessedConfigs();
         }
     }

diff --git a/src/main/java/org/cyclops/cyclopscore/modcompat/ModCompatLoader.java b/src/main/java/org/cyclops/cyclopscore/modcompat/ModCompatLoader.java
@@ -142,7 +142,7 @@ private boolean isEnabled(IExternalCompat compat, String id) {
     	Property property = config.get(CONFIG_CATEGORY, id,
                 compat.isEnabled());
         property.setRequiresMcRestart(true);
-        property.comment = compat.getComment();
+        property.setComment(compat.getComment());
         boolean enabled = property.getBoolean(true);
         if(config.hasChanged()) {
         	config.save();

diff --git a/src/main/java/org/cyclops/cyclopscore/world/gen/RetroGenRegistry.java b/src/main/java/org/cyclops/cyclopscore/world/gen/RetroGenRegistry.java
@@ -46,11 +46,11 @@ public void retroGenLoad(ChunkDataEvent.Load event) {
 			if(tag == null) {
 				tag = new NBTTagCompound();
 			}
-			setChunkSeed(event.world, event.getChunk());
+			setChunkSeed(event.getWorld(), event.getChunk());
 
 			boolean atLeastOneModified = false;
 			for(IRetroGen retroGen : retroGeneratables) {
-				if(retroGen.shouldRetroGen(tag, event.world.provider.getDimension())) {
+				if(retroGen.shouldRetroGen(tag, event.getWorld().provider.getDimension())) {
 					retroGen.retroGenerateChunk(tag, event.getChunk(), random);
 					getMod().log(Level.INFO, "Retrogenerating chunk at "
                             + event.getChunk().xPosition + ":" + event.getChunk().zPosition);