mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-22 23:28:35 +01:00
Fixed a Bug with the ESD
This commit is contained in:
parent
9748d86c0c
commit
768194ffcc
8 changed files with 32 additions and 8 deletions
|
@ -18,7 +18,7 @@ buildscript {
|
||||||
apply plugin: 'forge'
|
apply plugin: 'forge'
|
||||||
apply plugin: 'maven'
|
apply plugin: 'maven'
|
||||||
|
|
||||||
version = "1.7.10-0.0.6.3"
|
version = "1.7.10-0.0.6.4"
|
||||||
group = "ellpeck.actuallyadditions"
|
group = "ellpeck.actuallyadditions"
|
||||||
archivesBaseName = "ActuallyAdditions"
|
archivesBaseName = "ActuallyAdditions"
|
||||||
|
|
||||||
|
|
|
@ -30,6 +30,6 @@ public class ConfigValues{
|
||||||
currConf.currentValue = config.getBoolean(currConf.name, currConf.category, currConf.defaultValue, currConf.desc);
|
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.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,11 +10,12 @@ public class InitEvents{
|
||||||
|
|
||||||
Util.registerEvent(new SmeltEvent());
|
Util.registerEvent(new SmeltEvent());
|
||||||
Util.registerEvent(new CraftEvent());
|
Util.registerEvent(new CraftEvent());
|
||||||
Util.registerEvent(new KilledEvent());
|
Util.registerEvent(new LivingDropEvent());
|
||||||
Util.registerEvent(new PickupEvent());
|
Util.registerEvent(new PickupEvent());
|
||||||
Util.registerEvent(new TooltipEvent());
|
Util.registerEvent(new TooltipEvent());
|
||||||
Util.registerEvent(new EntityLivingEvent());
|
Util.registerEvent(new EntityLivingEvent());
|
||||||
Util.registerEvent(new WorldDecorationEvent());
|
Util.registerEvent(new WorldDecorationEvent());
|
||||||
|
//Util.registerEvent(new LivingKillEvent());
|
||||||
Util.registerEvent(new BucketFillEvent());
|
Util.registerEvent(new BucketFillEvent());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ import net.minecraftforge.event.entity.living.LivingDropsEvent;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
public class KilledEvent{
|
public class LivingDropEvent{
|
||||||
|
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
||||||
public void onEntityDropEvent(LivingDropsEvent event){
|
public void onEntityDropEvent(LivingDropsEvent event){
|
||||||
|
@ -23,6 +23,5 @@ public class KilledEvent{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -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);
|
||||||
|
}
|
||||||
|
}*/
|
||||||
|
}
|
||||||
|
}
|
|
@ -139,7 +139,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
|
||||||
|
|
||||||
ItemStack theStack = null;
|
ItemStack theStack = null;
|
||||||
for(int i = theSlotToPull; i < this.slotToPullEnd; i++){
|
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);
|
ItemStack tempStack = theInventory.getStackInSlot(i);
|
||||||
if(tempStack != null){
|
if(tempStack != null){
|
||||||
|
@ -201,7 +201,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
|
||||||
if(this.slots[0] != null){
|
if(this.slots[0] != null){
|
||||||
ItemStack theStack = null;
|
ItemStack theStack = null;
|
||||||
for(int i = theSlotToPut; i < this.slotToPutEnd; i++){
|
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);
|
ItemStack tempStack = theInventory.getStackInSlot(i);
|
||||||
if(tempStack != null){
|
if(tempStack != null){
|
||||||
|
|
|
@ -5,7 +5,7 @@ import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
public class ModUtil{
|
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 MOD_ID = "ActuallyAdditions";
|
||||||
public static final String NAME = "Actually Additions";
|
public static final String NAME = "Actually Additions";
|
||||||
|
|
|
@ -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.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.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=Square and yummy!
|
||||||
achievement.actuallyadditions.pickUpSolidXP.desc=Pick up some Solidified Experience
|
achievement.actuallyadditions.pickUpSolidXP.desc=Pick up some Solidified Experience
|
||||||
achievement.actuallyadditions.craftKnifeBlade=Sharp! So Sharp!
|
achievement.actuallyadditions.craftKnifeBlade=Sharp! So Sharp!
|
||||||
|
|
Loading…
Reference in a new issue