From 151dcc06dac15933abda7db40a164f315dba899e Mon Sep 17 00:00:00 2001 From: alesto Date: Thu, 22 Nov 2018 16:02:40 +0100 Subject: [PATCH] Updated mappings --- build.gradle | 14 ++++++++++++-- src/main/java/electroblob/wizardry/Wizardry.java | 4 ++-- .../wizardry/WizardryWorldGenerator.java | 4 ++-- .../electroblob/wizardry/block/BlockSnare.java | 4 ++-- .../electroblob/wizardry/block/BlockSpectral.java | 2 +- .../electroblob/wizardry/block/BlockStatue.java | 2 +- .../wizardry/block/BlockVanishingCobweb.java | 2 +- .../wizardry/enchantment/Imbuement.java | 2 +- .../entity/projectile/EntityMagicArrow.java | 2 +- .../wizardry/registry/WizardryBlocks.java | 2 +- .../wizardry/registry/WizardryItems.java | 2 +- .../wizardry/registry/WizardryTabs.java | 4 ++-- .../java/electroblob/wizardry/spell/Spell.java | 2 +- .../wizardry/util/WizardryUtilities.java | 4 ++-- 14 files changed, 30 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 65a2a407..13a9a780 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,7 @@ buildscript { repositories { + mavenCentral() + mavenLocal() jcenter() maven { url = "http://files.minecraftforge.net/maven" } } @@ -8,6 +10,7 @@ buildscript { } } apply plugin: 'net.minecraftforge.gradle.forge' +apply plugin: 'maven' //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. @@ -29,10 +32,16 @@ minecraft { // stable_# stables are built at the discretion of the MCP team. // Use non-default mappings at your own risk. they may not always work. // simply re-run your setup task after changing the mappings to update your workspace. - mappings = "snapshot_20180316" + mappings = "stable_39" // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. } +repositories { + mavenLocal() + mavenCentral() + maven { url = "http://maven.bluexin.be/repository/snapshots/" } +} + dependencies { // you may put jars on which you depend on in ./libs // or you may define them like so.. @@ -54,7 +63,8 @@ dependencies { // for more info... // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html // http://www.gradle.org/docs/current/userguide/dependency_management.html - + deobfCompile ("com.teamwizardry.librarianlib:librarianlib-particle-system-1.12.2:4.16-SNAPSHOT:deobf") {changing = true} + deobfCompile "com.teamwizardry:wizardry:0.9.7" } processResources { diff --git a/src/main/java/electroblob/wizardry/Wizardry.java b/src/main/java/electroblob/wizardry/Wizardry.java index 6001ced4..60f29c94 100644 --- a/src/main/java/electroblob/wizardry/Wizardry.java +++ b/src/main/java/electroblob/wizardry/Wizardry.java @@ -179,11 +179,11 @@ public class Wizardry { public static void onMissingMappingEvent(RegistryEvent.MissingMappings event){ // Just get, not getAll, since the mod id didn't change! for(RegistryEvent.MissingMappings.Mapping mapping : event.getAllMappings()){ - if(mapping.key.getResourceDomain().equals(Wizardry.MODID)){ + if(mapping.key.getNamespace().equals(Wizardry.MODID)){ Item replacement = null; - switch(mapping.key.getResourcePath()){ + switch(mapping.key.getPath()){ case "wand_basic": replacement = WizardryItems.magic_wand; break; case "wand_basic_fire": replacement = WizardryItems.basic_fire_wand; break; diff --git a/src/main/java/electroblob/wizardry/WizardryWorldGenerator.java b/src/main/java/electroblob/wizardry/WizardryWorldGenerator.java index ae66da70..0e6bed3e 100644 --- a/src/main/java/electroblob/wizardry/WizardryWorldGenerator.java +++ b/src/main/java/electroblob/wizardry/WizardryWorldGenerator.java @@ -175,7 +175,7 @@ public class WizardryWorldGenerator implements IWorldGenerator { } // 0 = West, 1 = North, 2 = East, 3 = South (The way you would face when walking out of the door) - EnumFacing orientation = EnumFacing.getHorizontal(random.nextInt(4)); + EnumFacing orientation = EnumFacing.byHorizontalIndex(random.nextInt(4)); boolean flip = random.nextBoolean(); if(checkSpaceForTower(world, origin, towerBlueprint, orientation, flip)){ @@ -299,7 +299,7 @@ public class WizardryWorldGenerator implements IWorldGenerator { // Rotates the door depending on whether flip is true. ItemDoor.placeDoor( world, pos, flip - ? EnumFacing.getHorizontal(3 - orientation.getHorizontalIndex()) + ? EnumFacing.byHorizontalIndex(3 - orientation.getHorizontalIndex()) .getOpposite() : orientation.rotateYCCW(), Blocks.OAK_DOOR, false); diff --git a/src/main/java/electroblob/wizardry/block/BlockSnare.java b/src/main/java/electroblob/wizardry/block/BlockSnare.java index 036e378a..878826df 100644 --- a/src/main/java/electroblob/wizardry/block/BlockSnare.java +++ b/src/main/java/electroblob/wizardry/block/BlockSnare.java @@ -51,7 +51,7 @@ public class BlockSnare extends BlockContainer { } @Override - public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity){ + public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity){ if(!world.isRemote && entity instanceof EntityLivingBase){ if(world.getTileEntity(pos) instanceof TileEntityPlayerSave){ @@ -80,7 +80,7 @@ public class BlockSnare extends BlockContainer { } @Override - public BlockRenderLayer getBlockLayer(){ + public BlockRenderLayer getRenderLayer() { return BlockRenderLayer.CUTOUT; } diff --git a/src/main/java/electroblob/wizardry/block/BlockSpectral.java b/src/main/java/electroblob/wizardry/block/BlockSpectral.java index d4c91f1a..300582dc 100644 --- a/src/main/java/electroblob/wizardry/block/BlockSpectral.java +++ b/src/main/java/electroblob/wizardry/block/BlockSpectral.java @@ -36,7 +36,7 @@ public class BlockSpectral extends BlockContainer { // Replaces getRenderBlockPass @Override - public BlockRenderLayer getBlockLayer(){ + public BlockRenderLayer getRenderLayer(){ return BlockRenderLayer.TRANSLUCENT; } diff --git a/src/main/java/electroblob/wizardry/block/BlockStatue.java b/src/main/java/electroblob/wizardry/block/BlockStatue.java index d4c3d891..4dce4a22 100644 --- a/src/main/java/electroblob/wizardry/block/BlockStatue.java +++ b/src/main/java/electroblob/wizardry/block/BlockStatue.java @@ -97,7 +97,7 @@ public class BlockStatue extends BlockContainer { } @Override - public BlockRenderLayer getBlockLayer(){ + public BlockRenderLayer getRenderLayer(){ return this.isIce ? BlockRenderLayer.TRANSLUCENT : BlockRenderLayer.SOLID; } diff --git a/src/main/java/electroblob/wizardry/block/BlockVanishingCobweb.java b/src/main/java/electroblob/wizardry/block/BlockVanishingCobweb.java index 8300834e..131134db 100644 --- a/src/main/java/electroblob/wizardry/block/BlockVanishingCobweb.java +++ b/src/main/java/electroblob/wizardry/block/BlockVanishingCobweb.java @@ -55,7 +55,7 @@ public class BlockVanishingCobweb extends BlockContainer { } @Override - public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity){ + public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity){ entity.setInWeb(); } diff --git a/src/main/java/electroblob/wizardry/enchantment/Imbuement.java b/src/main/java/electroblob/wizardry/enchantment/Imbuement.java index fa4465fa..18eee9bf 100644 --- a/src/main/java/electroblob/wizardry/enchantment/Imbuement.java +++ b/src/main/java/electroblob/wizardry/enchantment/Imbuement.java @@ -95,7 +95,7 @@ public interface Imbuement { })){ // If any imbuements were removed, inform about the removal of the enchantment(s), or // delete the book entirely if there are none left. - if(enchantmentList.hasNoTags()){ + if(enchantmentList.isEmpty()){ slot.putStack(ItemStack.EMPTY); // NOTE: Will need changing in 1.11 Wizardry.logger.info("Deleted enchanted book with illegal enchantments"); }else{ diff --git a/src/main/java/electroblob/wizardry/entity/projectile/EntityMagicArrow.java b/src/main/java/electroblob/wizardry/entity/projectile/EntityMagicArrow.java index cbcc6208..db78638f 100644 --- a/src/main/java/electroblob/wizardry/entity/projectile/EntityMagicArrow.java +++ b/src/main/java/electroblob/wizardry/entity/projectile/EntityMagicArrow.java @@ -434,7 +434,7 @@ public abstract class EntityMagicArrow extends Entity implements IProjectile, IE this.onBlockHit(); if(this.stuckInBlock.getMaterial() != Material.AIR){ - this.stuckInBlock.getBlock().onEntityCollidedWithBlock(this.world, raytraceresult.getBlockPos(), + this.stuckInBlock.getBlock().onEntityCollision(this.world, raytraceresult.getBlockPos(), this.stuckInBlock, this); } } diff --git a/src/main/java/electroblob/wizardry/registry/WizardryBlocks.java b/src/main/java/electroblob/wizardry/registry/WizardryBlocks.java index 3fcb2495..bc3df4af 100644 --- a/src/main/java/electroblob/wizardry/registry/WizardryBlocks.java +++ b/src/main/java/electroblob/wizardry/registry/WizardryBlocks.java @@ -70,7 +70,7 @@ public final class WizardryBlocks { */ public static void registerBlock(IForgeRegistry registry, Block block, String name){ block.setRegistryName(Wizardry.MODID, name); - block.setUnlocalizedName(block.getRegistryName().toString()); + block.setTranslationKey(block.getRegistryName().toString()); registry.register(block); } diff --git a/src/main/java/electroblob/wizardry/registry/WizardryItems.java b/src/main/java/electroblob/wizardry/registry/WizardryItems.java index e7bf125a..ab2df34f 100644 --- a/src/main/java/electroblob/wizardry/registry/WizardryItems.java +++ b/src/main/java/electroblob/wizardry/registry/WizardryItems.java @@ -271,7 +271,7 @@ public final class WizardryItems { */ public static void registerItem(IForgeRegistry registry, Item item, String name){ item.setRegistryName(Wizardry.MODID, name); - item.setUnlocalizedName(item.getRegistryName().toString()); + item.setTranslationKey(item.getRegistryName().toString()); registry.register(item); } diff --git a/src/main/java/electroblob/wizardry/registry/WizardryTabs.java b/src/main/java/electroblob/wizardry/registry/WizardryTabs.java index b0888768..6858715f 100644 --- a/src/main/java/electroblob/wizardry/registry/WizardryTabs.java +++ b/src/main/java/electroblob/wizardry/registry/WizardryTabs.java @@ -31,7 +31,7 @@ public final class WizardryTabs { @Override @SideOnly(Side.CLIENT) - public ItemStack getTabIconItem(){ + public ItemStack createIcon(){ return new ItemStack(WizardryItems.wizard_handbook); } @@ -47,7 +47,7 @@ public final class WizardryTabs { @Override @SideOnly(Side.CLIENT) - public ItemStack getTabIconItem(){ + public ItemStack createIcon(){ return new ItemStack(WizardryItems.spell_book); } diff --git a/src/main/java/electroblob/wizardry/spell/Spell.java b/src/main/java/electroblob/wizardry/spell/Spell.java index f15e49dd..c13ac7b0 100644 --- a/src/main/java/electroblob/wizardry/spell/Spell.java +++ b/src/main/java/electroblob/wizardry/spell/Spell.java @@ -399,7 +399,7 @@ public abstract class Spell extends IForgeRegistryEntry.Impl implements C */ public static Spell get(String name){ ResourceLocation key = new ResourceLocation(name); - if(key.getResourceDomain().equals("minecraft")) key = new ResourceLocation(Wizardry.MODID, name); + if(key.getNamespace().equals("minecraft")) key = new ResourceLocation(Wizardry.MODID, name); return ((ForgeRegistry)registry).getValue(key); } diff --git a/src/main/java/electroblob/wizardry/util/WizardryUtilities.java b/src/main/java/electroblob/wizardry/util/WizardryUtilities.java index 41301101..01f36882 100644 --- a/src/main/java/electroblob/wizardry/util/WizardryUtilities.java +++ b/src/main/java/electroblob/wizardry/util/WizardryUtilities.java @@ -540,7 +540,7 @@ public final class WizardryUtilities { Vec3d start = new Vec3d(entity.posX, entity.getEntityBoundingBox().minY + entity.getEyeHeight(), entity.posZ); Vec3d look = entity.getLookVec(); - Vec3d end = start.addVector(look.x * range, look.y * range, look.z * range); + Vec3d end = start.add(look.x * range, look.y * range, look.z * range); return world.rayTraceBlocks(start, end, hitLiquids); } @@ -893,7 +893,7 @@ public final class WizardryUtilities { // The original tag list should remain unchanged, hence the copy. NBTTagList tagList2 = (NBTTagList)tagList.copy(); - while(!tagList2.hasNoTags()){ + while(!tagList2.isEmpty()){ NBTBase tag = tagList2.removeTag(0); // Why oh why is NBTTagList not parametrised? It even has a tagType field, so it must know! try{