Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-12-22 19:39:24 +01:00
Code Issues Projects Releases Wiki Activity

Removed rarmor integration as the mod is being rewritten soon.

Browse source 
Sorry. :v
This commit is contained in:
Ellpeck 2016-06-17 14:54:53 +02:00
parent b3cac0cadf
commit cba94da5c5
8 changed files with 1 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build.gradle
View file

@ -49,7 +49,6 @@ dependencies {
compile "net.darkhax.tesla:Tesla:1.9.4-1.1.0.24"
deobfCompile "mezz.jei:jei_1.9.4:3.4.0.202"
compile files("lib/Rarmor.jar")
}
processResources {

2
src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java
View file

@ -139,7 +139,7 @@ public class ActuallyAdditions{
if(mapping.name != null){
String name = mapping.name.toLowerCase(Locale.ROOT);
if(name.startsWith(ModUtil.MOD_ID+":")){
if(name.contains("paxel") || name.contains("itemspecial") || name.contains("blockbookstand") || name.contains("rarmor") || name.contains("bucket")){
if(name.contains("paxel") || name.contains("itemspecial") || name.contains("blockbookstand") || name.contains("rarmor") || name.contains("bucket") || name.contains("modulereconstructor")){
mapping.ignore();
ModUtil.LOGGER.info("Missing Mapping "+mapping.name+" is getting ignored. This is intentional.");
}

5
src/main/java/de/ellpeck/actuallyadditions/mod/booklet/InitBooklet.java
View file

@ -157,10 +157,5 @@ public class InitBooklet{
new BookletChapter("growthRing", ActuallyAdditionsAPI.entryItemsRF, new ItemStack(InitItems.itemGrowthRing), new PageCrafting(1, ItemCrafting.recipeGrowthRing));
new BookletChapter("waterRemovalRing", ActuallyAdditionsAPI.entryItemsRF, new ItemStack(InitItems.itemWaterRemovalRing), new PageCrafting(1, ItemCrafting.recipeWaterRing));
new BookletChapter("batteries", ActuallyAdditionsAPI.entryItemsRF, new ItemStack(InitItems.itemBatteryTriple), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeBattery).setNoText(), new PageCrafting(3, ItemCrafting.recipeBatteryDouble).setNoText(), new PageCrafting(4, ItemCrafting.recipeBatteryTriple).setNoText(), new PageCrafting(5, ItemCrafting.recipeBatteryQuadruple).setNoText(), new PageCrafting(6, ItemCrafting.recipeBatteryQuintuple).setNoText());
//Crossover
if(Loader.isModLoaded("rarmor")){
new BookletChapter("rarmorModuleReconstructor", ActuallyAdditionsAPI.entryCrossover, new ItemStack(InitItems.itemRarmorModuleReconstructor), new PageTextOnly(1), new PageCrafting(2, ItemCrafting.recipeRarmorModuleReconstructor).setNoText());
}
}
}

10
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/ItemCrafting.java
View file

@ -83,7 +83,6 @@ public class ItemCrafting{
public static IRecipe recipeLens;
public static IRecipe recipeCrateKeeper;
public static IRecipe recipeEnderStar;
public static IRecipe recipeRarmorModuleReconstructor;
public static IRecipe recipeSpawnerChanger;
public static IRecipe recipeFilter;
@ -472,15 +471,6 @@ public class ItemCrafting{
new ItemStack(Items.SIGN)));
}
//Rarmor Reconstructor Module
if(Loader.isModLoaded("rarmor") && ConfigCrafting.RARMOR_RECONSTRUCTOR_MODULE.isEnabled()){
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemRarmorModuleReconstructor),
" G ", "GSG", " G ",
'G', ItemUtil.getItemFromName("rarmor:ribbonCable"),
'S', new ItemStack(InitBlocks.blockAtomicReconstructor)));
recipeRarmorModuleReconstructor = RecipeUtil.lastIRecipe();
}
//Tiny Coal
GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 8, TheMiscItems.TINY_COAL.ordinal()),
new ItemStack(Items.COAL));

1
src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java
View file

@ -189,7 +189,6 @@ public class CreativeTab extends CreativeTabs{
this.add(InitItems.itemSolidifiedExperience);
this.add(InitItems.itemLeafBlower);
this.add(InitItems.itemLeafBlowerAdvanced);
this.add(InitItems.itemRarmorModuleReconstructor);
this.add(InitItems.woodenPaxel);
this.add(InitItems.stonePaxel);

6
src/main/java/de/ellpeck/actuallyadditions/mod/items/InitItems.java
View file

@ -210,8 +210,6 @@ public class InitItems{
public static Item itemWaterBowl;
public static Item itemFilter;
public static Item itemRarmorModuleReconstructor;
public static void init(){
ModUtil.LOGGER.info("Initializing Items...");
@ -372,9 +370,5 @@ public class InitItems{
itemPantsCrystalWhite = new ItemArmorAA("itemPantsCrystalWhite", InitArmorMaterials.armorMaterialCrystalWhite, 2, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), Util.CRYSTAL_WHITE_RARITY);
itemBootsCrystalWhite = new ItemArmorAA("itemBootsCrystalWhite", InitArmorMaterials.armorMaterialCrystalWhite, 3, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), Util.CRYSTAL_WHITE_RARITY);
itemPaxelCrystalWhite = new ItemAllToolAA(InitToolMaterials.toolMaterialCrystalWhite, new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), "itemPaxelCrystalWhite", Util.CRYSTAL_WHITE_RARITY, 14606302);
if(Loader.isModLoaded("rarmor")){
itemRarmorModuleReconstructor = new ItemRarmorModuleReconstructor("itemRarmorModuleReconstructor");
}
}
}

140
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemRarmorModuleReconstructor.java
View file

@ -1,140 +0,0 @@
/*
* This file ("ItemRarmorModuleReconstructor.java") is part of the Actually Additions mod for Minecraft.
* It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at
* http://ellpeck.de/actaddlicense
* View the source code at https://github.com/Ellpeck/ActuallyAdditions
*
* © 2015-2016 Ellpeck
*/
package de.ellpeck.actuallyadditions.mod.items;
import cofh.api.energy.IEnergyContainerItem;
import de.canitzp.rarmor.api.InventoryBase;
import de.canitzp.rarmor.api.modules.IRarmorModule;
import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
import de.ellpeck.actuallyadditions.api.lens.Lens;
import de.ellpeck.actuallyadditions.mod.items.base.ItemBase;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor;
import de.ellpeck.actuallyadditions.mod.util.WorldUtil;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.Optional;
import java.util.ArrayList;
import java.util.List;
@Optional.Interface(modid = "rarmor", iface = "de.canitzp.rarmor.api.modules.IRarmorModule")
public class ItemRarmorModuleReconstructor extends ItemBase implements IRarmorModule{
public ItemRarmorModuleReconstructor(String name){
super(name);
this.setMaxStackSize(1);
}
@Override
public String getUniqueName(){
return this.getRegistryName().toString();
}
@Override
public EnumRarity getRarity(ItemStack stack){
return EnumRarity.RARE;
}
@Override
public ModuleType getModuleType(){
return ModuleType.ACTIVE;
}
@Override
public List<String> getGuiHelp(){
List text = new ArrayList<String>();
text.add("Read more about this in the");
text.add("Actually Additions Manual!");
return text;
}
@Override
public void onModuleTickInArmor(World world, EntityPlayer player, ItemStack armorChestplate, ItemStack module, InventoryBase inventory){
if(!world.isRemote && player.isSneaking() && player.onGround){
if(world.getTotalWorldTime()%50 == 0){
IAtomicReconstructor fake = this.getFakeReconstructor(world, player, armorChestplate);
RayTraceResult result = WorldUtil.getNearestPositionWithAir(world, player, fake.getLens().getDistance());
if(result != null){
BlockPos pos = result.getBlockPos();
if(pos != null){
int energyUse = TileEntityAtomicReconstructor.ENERGY_USE*2;
if(fake.getEnergy() >= energyUse){
fake.getLens().invoke(world.getBlockState(pos), pos, fake);
EnumFacing hit = result.sideHit;
TileEntityAtomicReconstructor.shootLaser(world, player.posX-player.width/2, player.posY+player.getYOffset()+player.getEyeHeight()/2, player.posZ-player.width/2, pos.getX()+hit.getFrontOffsetX(), pos.getY()+hit.getFrontOffsetY(), pos.getZ()+hit.getFrontOffsetZ(), fake.getLens());
fake.extractEnergy(energyUse);
}
}
}
}
}
}
private IAtomicReconstructor getFakeReconstructor(final World world, final EntityPlayer player, final ItemStack armorChestplate){
return new IAtomicReconstructor(){
@Override
public int getX(){
return MathHelper.floor_double(player.posX);
}
@Override
public int getY(){
return MathHelper.floor_double(player.posY);
}
@Override
public int getZ(){
return MathHelper.floor_double(player.posZ);
}
@Override
public World getWorldObject(){
return world;
}
@Override
public void extractEnergy(int amount){
Item item = armorChestplate.getItem();
if(item instanceof IEnergyContainerItem){
((IEnergyContainerItem)item).extractEnergy(armorChestplate, amount, false);
}
}
@Override
public int getEnergy(){
Item item = armorChestplate.getItem();
if(item instanceof IEnergyContainerItem){
return ((IEnergyContainerItem)item).getEnergyStored(armorChestplate);
}
else{
return 0;
}
}
@Override
public Lens getLens(){
return ActuallyAdditionsAPI.lensDefaultConversion;
}
};
}
}

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

@ -866,9 +866,6 @@ booklet.actuallyadditions.chapter.enderStar.text.1=The <item>Ender Star<r> can b
booklet.actuallyadditions.chapter.phantomRedstoneface.name=Phantom Redstoneface
booklet.actuallyadditions.chapter.phantomRedstoneface.text.1=<imp>If you don't know what Phantomfaces are, check the Phantomfaces Entry first.<r> <n><n>The <item>Phantom Redstoneface<r> can be used to transmit redstone signals. This one, however, <imp>works differently<r> to the other Phantomfaces as it <imp>only works in one direction<r>. What this means is that the <imp>connected block has to provide redstone power<r> for redstone next to the Redstoneface to become powered. It does <imp>not work<r> the <imp>other way<r> around.
booklet.actuallyadditions.chapter.rarmorModuleReconstructor.name=Reconstruction Module
booklet.actuallyadditions.chapter.rarmorModuleReconstructor.text.1=The <item>Reconstruction Module<r> can be used in the <item>Rarmor<r>. The Rarmor is a type of configurable armor that is added by the <imp>Rarmor Mod<r>. <n>If you want to use this module, place it inside the Rarmor GUI that is accessed by <imp>wearing the armor<r> and <imp>opening your inventory<r>. <n><n>The module, when the player is <imp>sneaking<r>, will shoot out a <imp>reconstruction beam<r> that would be created by the Atomic Reconstructor <imp>without a lens<r>. This will cause blocks that are hit to be reconstructed.
booklet.actuallyadditions.chapter.spawnerShard.name=Spawner Shards
booklet.actuallyadditions.chapter.spawnerShard.text.1=The <item>Spawner Shards<r> are a crafting ingredient found by <imp>breaking spawners<r>. Once a spawner in the world is broken, it will always drop <imp>one<r> Shard.