Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 07:13:28 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a Bug with the ESD

Browse source
This commit is contained in:
Ellpeck 2015-07-02 19:03:44 +02:00
parent 9748d86c0c
commit 768194ffcc
8 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -18,7 +18,7 @@ buildscript {
apply plugin: 'forge'
apply plugin: 'maven'
version = "1.7.10-0.0.6.3"
version = "1.7.10-0.0.6.4"
group = "ellpeck.actuallyadditions"
archivesBaseName = "ActuallyAdditions"

2
src/main/java/ellpeck/actuallyadditions/config/ConfigValues.java
View file

@ -30,6 +30,6 @@ public class ConfigValues{
currConf.currentValue = config.getBoolean(currConf.name, currConf.category, currConf.defaultValue, currConf.desc);
}
crusherRecipeExceptions = config.getStringList("Crusher Recipe Exceptions", ConfigCategories.CRUSHER_RECIPES.name, new String[]{"ingotBrick", "ingotBrickNether"}, "The Ingots, Dusts and Ores blacklisted from being auto-registered by the Crusher. This list uses OreDictionary Names of the Inputs only.");
crusherRecipeExceptions = config.getStringList("Crusher Recipe Exceptions", ConfigCategories.CRUSHER_RECIPES.name, new String[]{"ingotBrick", "ingotBrickNether"}, "The Ingots, Dusts and Ores blacklisted from being auto-registered to be crushed by the Crusher. This list uses OreDictionary Names of the Inputs only.");
}
}

3
src/main/java/ellpeck/actuallyadditions/event/InitEvents.java
View file

@ -10,11 +10,12 @@ public class InitEvents{
Util.registerEvent(new SmeltEvent());
Util.registerEvent(new CraftEvent());
Util.registerEvent(new KilledEvent());
Util.registerEvent(new LivingDropEvent());
Util.registerEvent(new PickupEvent());
Util.registerEvent(new TooltipEvent());
Util.registerEvent(new EntityLivingEvent());
Util.registerEvent(new WorldDecorationEvent());
//Util.registerEvent(new LivingKillEvent());
Util.registerEvent(new BucketFillEvent());
}

3
src/main/java/ellpeck/actuallyadditions/event/KilledEvent.java → src/main/java/ellpeck/actuallyadditions/event/LivingDropEvent.java
View file

@ -9,7 +9,7 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent;
import java.util.Random;
public class KilledEvent{
public class LivingDropEvent{
@SubscribeEvent
public void onEntityDropEvent(LivingDropsEvent event){
@ -23,6 +23,5 @@ public class KilledEvent{
}
}
}
}
}

20
src/main/java/ellpeck/actuallyadditions/event/LivingKillEvent.java Normal file
View file

@ -0,0 +1,20 @@
package ellpeck.actuallyadditions.event;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
public class LivingKillEvent{
private static final int SQUID_MESSAGES = 3;
@SubscribeEvent
public void onDeathEvent(LivingDeathEvent event){
/*if(event.source.getEntity() instanceof EntityPlayer){
if(event.entity instanceof EntitySquid){
String message = StatCollector.translateToLocal("info."+ModUtil.MOD_ID_LOWER+".squidKilled.desc."+(new Random().nextInt(SQUID_MESSAGES)+1));
((EntityPlayer)event.source.getEntity()).addChatComponentMessage(new ChatComponentText(message));
event.source.getEntity().worldObj.playSoundAtEntity(event.source.getEntity(), "mob.wither.death", 0.3F, 0.001F);
}
}*/
}
}

4
src/main/java/ellpeck/actuallyadditions/tile/TileEntityInputter.java
View file

@ -139,7 +139,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
ItemStack theStack = null;
for(int i = theSlotToPull; i < this.slotToPullEnd; i++){
if(i >= theInventory.getSizeInventory()) return;
if(i < 0 || i >= theInventory.getSizeInventory()) return;
ItemStack tempStack = theInventory.getStackInSlot(i);
if(tempStack != null){
@ -201,7 +201,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
if(this.slots[0] != null){
ItemStack theStack = null;
for(int i = theSlotToPut; i < this.slotToPutEnd; i++){
if(i >= theInventory.getSizeInventory()) return;
if(i < 0 || i >= theInventory.getSizeInventory()) return;
ItemStack tempStack = theInventory.getStackInSlot(i);
if(tempStack != null){

2
src/main/java/ellpeck/actuallyadditions/util/ModUtil.java
View file

@ -5,7 +5,7 @@ import org.apache.logging.log4j.Logger;
public class ModUtil{
public static final String VERSION = "1.7.10-0.0.6.3";
public static final String VERSION = "1.7.10-0.0.6.4";
public static final String MOD_ID = "ActuallyAdditions";
public static final String NAME = "Actually Additions";

4
src/main/resources/assets/actuallyadditions/lang/en_US.lang
View file

@ -554,6 +554,10 @@ info.actuallyadditions.update.download.desc=[{"text":"Download the newest Versio
info.actuallyadditions.update.failed.desc=[{"text":"The Update Check for "},{"text":"Actually Additions ","color":"dark_green","bold":"true"},{"text":"failed! Check your Internet Connection and the Logs for more Info!","color":"none"}]
info.actuallyadditions.update.changelog.desc=Updates: %s
info.actuallyadditions.squidKilled.desc.1=You just killed a squid, am I right!?
info.actuallyadditions.squidKilled.desc.2=YOU DIDN'T JUST DO THAT!
info.actuallyadditions.squidKilled.desc.3=The thing you just did... someone's gonna be pissed about that!
achievement.actuallyadditions.pickUpSolidXP=Square and yummy!
achievement.actuallyadditions.pickUpSolidXP.desc=Pick up some Solidified Experience
achievement.actuallyadditions.craftKnifeBlade=Sharp! So Sharp!