diff --git a/README.md b/README.md
index 55a35fde..dfeca11f 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Melt down any metals you find.
Power the world with spinning wind!
##Development
-Install Forge as usual, and setup your IDE as with any other Forge project. Forge Multipart, and CClib must be installed from the Forge File Server: [ForgeMultipart](http://files.minecraftforge.net/ForgeMultipart/). [CClib](http://files.minecraftforge.net/CodeChickenLib/). The DEVELOPMENT version of NEI must be installed to the same directory from [Chicken Bones Site](http://www.chickenbones.craftsaddle.org/Files/New_Versions/links.php). Copy `TCore_dummy.jar` to `forge/mcp/jars/mods/` to enable the Preloader (optional -- only needed when working on the preloader itself)
+Install Forge as usual, and setup your IDE as with any other Forge project. Forge Multipart, and CClib must be installed from the Forge File Server: The DEVELOPMENT version of NEI must be installed to the same directory from [Chicken Bones Site](http://www.chickenbones.craftsaddle.org/Files/New_Versions/links.php). Copy `TCore_dummy.jar` to `forge/mcp/jars/mods/` to enable the Preloader (optional -- only needed when working on the preloader itself)
##Compile from Source
Note: Git MUST be installed and in the system path to use our scripts.
diff --git a/build.gradle b/build.gradle
index 5b41ce0d..e7638884 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,17 +9,16 @@
buildscript {
repositories {
mavenCentral()
- mavenLocal()
+ mavenLocal()
maven {
name = 'ForgeFS'
url = 'http://files.minecraftforge.net/maven'
}
- maven {
+ maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
-
- }
+ }
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
}
@@ -31,10 +30,10 @@ repositories {
name 'CB Maven FS'
url "http://chickenbones.net/maven/"
}
- maven {
+ maven {
name "ProfMobius Maven FS"
url "http://mobiusstrip.eu/maven"
- }
+ }
maven {
name 'DVS1 Maven FS'
url 'http://dvs1.progwml6.com/files/maven'
@@ -42,7 +41,7 @@ repositories {
maven {
name 'ForgeFS'
url 'http://files.minecraftforge.net/maven'
- }
+ }
}
// Load ForgeGradle
@@ -65,11 +64,11 @@ configurations {
dependencies {
compile "mantle:Mantle:${config.minecraft_version}-${config.mantle_version}:deobf"
- compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev"
- compile "codechicken:CodeChickenCore:${config.minecraft_version}-${config.ccc_version}:dev"
+ compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.CCLIB_version}:dev"
+ compile "codechicken:CodeChickenCore:${config.minecraft_version}-${config.ccc_version}:dev"
compile "codechicken:NotEnoughItems:${config.minecraft_version}-${config.NEI_version}:dev"
- //compile "mcp.mobius.waila:Waila:${config.waila_version}:dev"
- deployerJars 'org.apache.maven.wagon:wagon-ssh:2.2'
+ compile "mcp.mobius.waila:Waila:${config.waila_version}:dev"
+ deployerJars 'org.apache.maven.wagon:wagon-ssh:2.2'
}
// Finds and sets version data
@@ -101,7 +100,7 @@ version = "${config.minecraft_version}-${artifact_version}"
minecraft {
version = config.minecraft_version + "-" + config.forge_version
- assetDir = 'run/assets'
+ runDir = 'run'
replace '${version}', project.version
}
@@ -156,7 +155,7 @@ task libJar(type: Jar) {
// Create Maven source jar
task sourceJar(type: Jar, dependsOn:classes) {
classifier = 'sources'
- from sourceSets.main.allSource
+ from sourceSets.main.allJava
}
artifacts {
diff --git a/build.properties b/build.properties
index a8429a47..b9261f29 100644
--- a/build.properties
+++ b/build.properties
@@ -1,9 +1,8 @@
minecraft_version=1.7.10
-minecraft_version_old=1.7.2
forge_version=10.13.0.1187
-mantle_version=161.45beb09
-CCLIB_version=1.1.1.93
+mantle_version=0.3.1.jenkins169
+CCLIB_version=1.1.1.95
NEI_version=1.0.2.15
-ccc_version=1.0.1.8
+ccc_version=1.0.2.9
mod_version=1.6.0
-waila_version=1.5.3
\ No newline at end of file
+waila_version=1.5.3_1.7.10
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 667288ad..b7612167 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 55f4524a..678d9d8d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 29 18:00:54 CDT 2013
+#Wed Jul 02 15:54:47 CDT 2014
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
diff --git a/resources/assets/tinker/lang/ko_KR.lang b/resources/assets/tinker/lang/ko_KR.lang
new file mode 100644
index 00000000..ca52ca10
--- /dev/null
+++ b/resources/assets/tinker/lang/ko_KR.lang
@@ -0,0 +1,826 @@
+itemGroup.TConstructTools=땜장이 구성 도구
+itemGroup.TConstructMaterials=땜장이 구성 재료
+itemGroup.TConstructBlocks=땜장이 구성 블럭
+itemGroup.TConstructParts=땜장이 구성 도구 부분
+itemGroup.TConstructEquipables=땜장이의 장비
+
+crafters.ToolStation=도구 조립대
+crafters.ToolForge=도구 제련소
+crafters.TinkerTable=땜장이의 테이블
+crafters.PartBuilder=부품 제작소
+crafters.PatternShaper=틀 제작소
+crafters.CraftingStation=조합 작업대
+inventory.PatternChest=틀 저장고
+crafters.Smeltery=용광로
+crafters.Frypan=후라이팬
+inventory.knapsack=배낭
+
+ToolStation.Crafter.name=도구 조립대
+ToolStation.Parts.name=부품 제작소
+ToolStation.PatternChest.name=틀 저장고
+ToolStation.PatternShaper.name=틀 제작소
+ToolStation.CastingTable.name=주조용 테이블
+tile.FurnaceSlab.name=반블럭 화로
+
+tile.ToolForge.name=도구 제련소
+tile.TinkerTable.name=땜장이의 테이블
+tile.Armor.DryingRack.name=건조대
+CraftedSoil.Slime.name=걸쭉한 진흙
+CraftedSoil.Grout.name=그라우트
+CraftedSoil.BlueSlime.name=걸쭉한 진흙
+CraftedSoil.GraveyardSoil.name=죽은 흙
+CraftedSoil.ConsecratedSoil.name=축성된 흙
+tile.CastingChannel.name=주조 연결대
+tile.slime.channel.name=슬라임 채널
+tile.slime.pad.name=튀어오르는 패드
+tile.blood.channel.name=피의 채널
+
+MetalOre.NetherSlag.name=네더렉 찌꺼기
+MetalOre.Cobalt.name=코발트 광석
+MetalOre.Ardite.name=아르다이트 광석
+MetalOre.Copper.name=구리 광석
+MetalOre.Tin.name=주석 광석
+MetalOre.Aluminum.name=알루미늄 광석
+MetalOre.Slag.name=돌 찌꺼기
+
+block.oreberry.iron.name=철 광석베리 덤불
+block.oreberry.gold.name=금 광석베리 덤불
+block.oreberry.copper.name=구리 광석베리 덤불
+block.oreberry.tin.name=주석 광석베리 덤불
+block.oreberry.aluminum.name=알루미늄 광석베리 덤불
+block.oreberry.essence.name=에센스베리 덤불
+
+block.ore.gravel.iron.name=철 자갈 광석
+block.ore.gravel.gold.name=금 자갈 광석
+block.ore.gravel.copper.name=구리 자갈 광석
+block.ore.gravel.tin.name=주석 자갈 광석
+block.ore.gravel.aluminum.name=알루미늄 자갈 광석
+block.ore.gravel.cobalt.name=코발트 자갈 광석
+
+block.brownstone.rough.name=거칠거칠한 브라운 스톤
+block.brownstone.rough.road.name=거칠거칠한 브라운 스톤 도로
+block.brownstone.smooth.name=브라운 스톤
+block.brownstone.smooth.brick.name=브라운 스톤 벽돌
+block.brownstone.smooth.road.name=브라운 스톤 벽돌
+block.brownstone.smooth.fancy.name=꾸며진 브라운 스톤
+block.brownstone.smooth.chiseled.name=조각 된 브라운 스톤
+
+block.brownstone.rough.slab.name=거칠거칠한 브라운 스톤 반블럭
+block.brownstone.rough.road.slab.name=거칠거칠한 브라운 스톤 도로 반블럭
+block.brownstone.smooth.slab.name=브라운 스톤 반블럭
+block.brownstone.smooth.brick.slab.name=브라운 스톤 벽돌 반블럭
+block.brownstone.smooth.road.slab.name=브라운 스톤 도로 반블럭
+block.brownstone.smooth.fancy.slab.name=세련된 브라운 스톤 반블럭
+block.brownstone.smooth.chiseled.slab.name=조각 된 브라운 스톤 반블럭
+
+block.brick.obsidian.name=흑요석 벽돌
+block.brick.sandstone.name=사암 벽돌
+block.brick.netherrack.name=네더랙 벽돌
+block.brick.iron.name=철블럭 벽돌
+block.brick.gold.name=금블럭 벽돌
+block.brick.diamond.name=다이아 블럭 벽돌
+block.brick.lapis.name=라피스 벽볼 벽돌
+block.brick.stone.refined.name=세련된 돌 벽돌
+block.brick.redstone.name=레드스톤 블럭 벽돌
+block.brick.bone.name=뼈로 된 벽돌
+block.brick.slime.name=슬라임 벽돌
+block.brick.blueslime.name=슬라임 벽돌
+block.brick.endstone.name=엔드 스톤 벽돌
+block.brick.obsidian.ingot.name=흑요석 벽돌
+
+block.fancybrick.obsidian.name=세련된 흑요석 벽돌
+block.fancybrick.sandstone.name=세련된 사암 벽돌
+block.fancybrick.netherrack.name=세련된 네더랙 벽돌
+block.fancybrick.iron.name=세련된 철 벽돌
+block.fancybrick.gold.name=세련된 금 벽돌
+block.fancybrick.diamond.name=세련된 다이아몬드 벽돌
+block.fancybrick.lapis.name=세련된 라피스 벽돌
+block.fancybrick.stone.refined.name=정제된 벽돌
+block.fancybrick.redstone.name=세련된 레드스톤 벽돌
+block.fancybrick.bone.name=세련된 뼈 벽돌
+block.fancybrick.slime.name=세련된 슬라임 벽돌
+block.fancybrick.blueslime.name=세련된 슬라임 벽돌
+block.fancybrick.endstone.name=세련된 엔드 스톤 벽돌
+block.fancybrick.obsidian.ingot.name=세련된 흑요석 벽돌
+block.fancybrick.stone.road.name=돌 도로
+block.fancybrick.stone.name=세련된 돌 벽돌
+
+tile.rail.wood.name=나무 레일
+
+tile.cloth.white.slab.name=양털 반블럭
+tile.cloth.orange.slab.name=주황색 양털 반블럭
+tile.cloth.magenta.slab.name=자홍색 양털 반블럭
+tile.cloth.lightBlue.slab.name=하늘색 양털 반블럭
+tile.cloth.yellow.slab.name=노랑색 양털 반블럭
+tile.cloth.lime.slab.name=연두색 양털 반블럭
+tile.cloth.pink.slab.name=분홍색 양털 반블럭
+tile.cloth.gray.slab.name=회색 양털 반블럭
+tile.cloth.silver.slab.name=밝은 회색 양털 반블럭
+tile.cloth.cyan.slab.name=청록색 양털 반블럭
+tile.cloth.purple.slab.name=보라색 양털 반블럭
+tile.cloth.blue.slab.name=파랑색 양털 반블럭
+tile.cloth.brown.slab.name=갈색 양털 반블럭
+tile.cloth.green.slab.name=초록색 양털 반블럭
+tile.cloth.red.slab.name=빨강색 양털 반블럭
+tile.cloth.black.slab.name=검은색 양털 반블럭
+
+tile.GlueBlock.name=접착 블럭
+tile.liquid.glue.name=접착제
+
+tile.Frypan.name=플라이팬
+
+item.oreberry.iron.name=철 광석베리
+item.oreberry.gold.name=금 광석베리
+item.oreberry.copper.name=구리 광석베리
+item.oreberry.tin.name=주석 광석베리
+item.oreberry.aluminum.name=알루미늄 광석베리
+item.oreberry.essence.name=농축 에센스 베리
+
+item.goldenhead.name=금으로 만든 머리
+item.tconstruct.titleicon.name=스폰
+
+tile.tconstruct.meatblock.name=햄본
+
+item.InfiTool.Pickaxe.name=곡괭이
+item.InfiTool.Shovel.name=삽
+item.InfiTool.Axe.name=손도끼
+item.InfiTool.Broadsword.name=브로드 스워드
+item.InfiTool.Longsword.name=롱 소드
+item.InfiTool.Rapier.name=레이피어
+item.InfiTool.FryPan.name=후라이팬
+item.InfiTool.Battlesign.name=전투 표지판
+item.InfiTool.Dagger.name=단검
+item.InfiTool.Chisel.name=조각칼
+item.InfiTool.Scythe.name=낫
+item.InfiTool.LumberAxe.name=벌목용 도끼
+item.InfiTool.Cleaver.name=식칼
+item.InfiTool.Excavator.name=발굴 삽
+item.InfiTool.Hammer.name=망치
+item.InfiTool.Battleaxe.name=전투 도끼
+item.InfiTool.Cutlass.name=커틀래스
+item.InfiTool.Shortbow.name=쇼트 보우
+item.InfiTool.Arrow.name=화살
+item.InfiTool.PotionLauncher.name=포션 발사기
+item.InfiTool.Mattock.name=매톡
+
+item.tool.randomarrow=랜덤 화살
+
+item.tconstruct.Pattern.blank_pattern.name=비어 있는 틀
+item.tconstruct.Pattern.rod.name=손잡이 틀
+item.tconstruct.Pattern.pickaxe.name=곡괭이 머리 틀
+item.tconstruct.Pattern.shovel.name=삽 머리 틀
+item.tconstruct.Pattern.axe.name=도끼 머리 틀
+item.tconstruct.Pattern.swordblade.name=칼날 틀
+item.tconstruct.Pattern.largeguard.name=와이드가드 틀
+item.tconstruct.Pattern.mediumguard.name=핸드가드 틀
+item.tconstruct.Pattern.crossbar.name=가로대 틀
+item.tconstruct.Pattern.binding.name=도구 연결부 틀
+item.tconstruct.Pattern.frypan.name=팬 틀
+item.tconstruct.Pattern.sign.name=와이드보드 틀
+item.tconstruct.Pattern.knifeblade.name=검 날 틀
+item.tconstruct.Pattern.chisel.name=조각칼 머리 틀
+item.tconstruct.Pattern.largerod.name=강한 손잡이 틀
+item.tconstruct.Pattern.toughbinding.name=강한 연결대 틀
+item.tconstruct.Pattern.largeplate.name=큰 판 틀
+item.tconstruct.Pattern.broadaxe.name=넓은날 도끼 머리 틀
+item.tconstruct.Pattern.scythe.name=낫 머리 틀
+item.tconstruct.Pattern.excavator.name=발굴 삽 머리 틀
+item.tconstruct.Pattern.largeblade.name=클 검 날 틀
+item.tconstruct.Pattern.hammerhead.name=망치 머리 틀
+item.tconstruct.Pattern.fullguard.name=풀 가드 틀
+item.tconstruct.Pattern.bowstring.name=활시위 틀
+item.tconstruct.Pattern.fletching.name=화살 깃 틀
+item.tconstruct.Pattern.arrowhead.name=화살 머리 틀
+
+item.tconstruct.Pattern.blank_cast.name=빈 주조대
+item.tconstruct.MetalPattern.rod.name=손잡이 주조대
+item.tconstruct.MetalPattern.pickaxe.name=곡괭이 머리 주조대
+item.tconstruct.MetalPattern.shovel.name=삽 머리 주조대
+item.tconstruct.MetalPattern.axe.name=도끼 머리 주조대
+item.tconstruct.MetalPattern.swordblade.name=칼 날 주조대
+item.tconstruct.MetalPattern.largeguard.name=와이드가드 주조대
+item.tconstruct.MetalPattern.mediumguard.name=핸드가드 주조대
+item.tconstruct.MetalPattern.crossbar.name=가로대 주조대
+item.tconstruct.MetalPattern.binding.name=도구 연결부 주조대
+item.tconstruct.MetalPattern.frypan.name=팬 주조대
+item.tconstruct.MetalPattern.sign.name=와이드보드 주조대
+item.tconstruct.MetalPattern.knifeblade.name=검 날 주조대
+item.tconstruct.MetalPattern.chisel.name=조각칼 머리 주조대
+item.tconstruct.MetalPattern.largerod.name=강한 손잡이 주조대
+item.tconstruct.MetalPattern.toughbinding.name=강한 연결부 주조대
+item.tconstruct.MetalPattern.largeplate.name=큰 판 주조대
+item.tconstruct.MetalPattern.broadaxe.name=넓은날 도끼 주조대
+item.tconstruct.MetalPattern.scythe.name=낫 머리 주조대
+item.tconstruct.MetalPattern.excavator.name=발굴 삽 머리 주조대
+item.tconstruct.MetalPattern.largeblade.name=큰 칼날 주조대
+item.tconstruct.MetalPattern.hammerhead.name=망치 머리 주조대
+item.tconstruct.MetalPattern.fullguard.name=풀가드 주조대
+item.tconstruct.MetalPattern.bowstring.name=활시위 주조대
+item.tconstruct.MetalPattern.fletching.name=화살 깃 주조대
+item.tconstruct.MetalPattern.arrowhead.name=화살 머리 주조대
+item.tconstruct.MetalPattern.ingot.name=주괴 주조대
+item.tconstruct.MetalPattern.gem.name=보석 주조대
+
+item.tconstruct.Materials.PaperStack.name=종이 뭉치
+item.tconstruct.Materials.SlimeCrystal.name=슬라임 수정
+item.tconstruct.Materials.SearedBrick.name=탄 벽돌
+item.tconstruct.Materials.CobaltIngot.name=코발트 주괴
+item.tconstruct.Materials.ArditeIngot.name=아르다이트 주괴
+item.tconstruct.Materials.ManyullynIngot.name=마니율린 주괴
+item.tconstruct.Materials.Mossball.name=이끼 공
+item.tconstruct.Materials.LavaCrystal.name=용암 수정
+item.tconstruct.Materials.NecroticBone.name=괴저성의 뼈
+item.tconstruct.Materials.CopperIngot.name=구리 주괴
+item.tconstruct.Materials.TinIngot.name=주석 주괴
+item.tconstruct.Materials.AluminumIngot.name=알루미늄 주괴
+item.tconstruct.Materials.RawAluminum.name=생 알루미늄
+item.tconstruct.Materials.BronzeIngot.name=청동 주괴
+item.tconstruct.Materials.AluBrassIngot.name=알루미늄 황동 주괴
+item.tconstruct.Materials.AlumiteIngot.name=알루마이트 주괴
+item.tconstruct.Materials.SteelIngot.name=강철 주괴
+item.tconstruct.Materials.BlueSlimeCrystal.name=슬라임 수정
+item.tconstruct.Materials.ObsidianIngot.name=흑요석 주괴
+item.tconstruct.Materials.IronNugget.name=철 조각
+item.tconstruct.Materials.CopperNugget.name=구리 조각
+item.tconstruct.Materials.TinNugget.name=주석 조각
+item.tconstruct.Materials.AluminumNugget.name=알루미늄 조각
+item.tconstruct.Materials.EssenceCrystal.name=가짜 에센스 수정
+item.tconstruct.Materials.AluBrassNugget.name=알루미늄 황동 조각
+item.tconstruct.Materials.SilkyCloth.name=비단 천
+item.tconstruct.Materials.SilkyJewel.name=실크로 된 보석
+item.tconstruct.Materials.ObsidianNugget.name=흑요석 조각
+item.tconstruct.Materials.CobaltNugget.name=코발트 조각
+item.tconstruct.Materials.ArditeNugget.name=아르다이트 조각
+item.tconstruct.Materials.ManyullynNugget.name=마니율린 조각
+item.tconstruct.Materials.BronzeNugget.name=청동 조각
+item.tconstruct.Materials.AlumiteNugget.name=알루마이트 조각
+item.tconstruct.Materials.SteelNugget.name=강철 조각
+item.tconstruct.Materials.PigIronIngot.name=선철 주괴
+item.tconstruct.Materials.PigIronNugget.name=선철 접시
+item.tconstruct.Materials.GlueBall.name=접착 공
+item.tconstruct.Materials.ArditeDust.name=알다이트 가루
+item.tconstruct.Materials.CobaltDust.name=코발트 가루
+item.tconstruct.Materials.AluminumDust.name=알루미늄 가루
+item.tconstruct.Materials.ManyullynDust.name=마니율린 가루
+item.tconstruct.Materials.AluBrassDust.name=알루미늄 황동 가루
+
+item.tconstruct.ArmorPattern.helmet.name=핼맷 주조대
+item.tconstruct.ArmorPattern.chestplate.name=갑옷 주조대
+item.tconstruct.ArmorPattern.leggings.name=레깅스 주조대
+item.tconstruct.ArmorPattern.boots.name=부츠 주조대
+
+item.tconstruct.helmetWood.name=나무 핼맷
+item.tconstruct.chestplateWood.name=나무 갑옷
+item.tconstruct.leggingsWood.name=나무 레깅스
+item.tconstruct.bootsWood.name=나무 부츠
+
+item.tconstruct.travelgoggles.name=탐험가의 고글
+item.tconstruct.travelvest.name=탐험가의 조끼
+item.tconstruct.travelwings.name=탐험가의 날개
+item.tconstruct.travelboots.name=탐험가의 부츠
+item.tconstruct.travelgloves.name=탐험가의 장갑
+item.tconstruct.travelbelt.name=탐험가의 벨트
+
+item.tconstruct.jerky.beef.name=소고기 육포
+item.tconstruct.jerky.pig.name=베이컨 육포
+item.tconstruct.jerky.chicken.name=치킨 육포
+item.tconstruct.jerky.sheep.name=양고기 육포
+item.tconstruct.jerky.fish.name=물고기 육포
+item.tconstruct.jerky.zombie.name=몬스터 육포
+item.tconstruct.jerky.blueslime.name=젤라틴 슬라임 방울
+item.tconstruct.jerky.blood.name=응고한 피 방울
+
+beginnertool.pickaxe=초보자의 곡괭이
+beginnertool.hatchet=초보자의 손도끼
+
+Smeltery.Controller.name=용광로 조작기
+Smeltery.Drain.name=용광로 드레인
+Smeltery.Brick.name=타버린 벽돌
+Smeltery.Stone.name=타버린 돌
+Smeltery.Cobblestone.name=타버린 조약돌
+Smeltery.Paver.name=타 버린 태두리가 조각된 돌
+Smeltery.Brick.Cracked.name=타 버린 부셔진 벽돌
+Smeltery.Road.name=타 버린 도로
+Smeltery.Brick.Fancy.name=타 버린 세련된 벽돌
+Smeltery.Brick.Square.name=타 버린 조각 된 벽돌
+Smeltery.Brick.Creeper.name=타 버린 조각 된 벽돌
+Smeltery.Channel.name=캐스팅 체널
+block.slime.soil.dirt.name=끈적한 흙
+
+LavaTank.Tank.name=타 버린 탱크
+LavaTank.Gague.name=타 버린 유리
+LavaTank.Window.name=타 버린 창문
+
+tile.landmine.name=지뢰
+
+tile.trap.punji.name=죽창 함정
+tile.trap.barricade.oak.name=참나무 바리케이트
+tile.trap.barricade.spruce.name=가문비나무 바리케이트
+tile.trap.barricade.birch.name=자작나무 바리케이트
+tile.trap.barricade.jungle.name=정글나무 바리케이트
+tile.explosive.slime.name=SDX
+
+StorageMetals.Cobalt.name=코발트 블럭
+StorageMetals.Ardite.name=아르다이트 블럭
+StorageMetals.Manyullyn.name=마니율리 블럭
+StorageMetals.Copper.name=구리 블럭
+StorageMetals.Bronze.name=청동 블럭
+StorageMetals.Tin.name=주석 블럭
+StorageMetals.Aluminum.name=알루미늄 블럭
+StorageMetals.AlBrass.name=알루미늄 황동 블럭
+StorageMetals.Alumite.name=알루마이트 블럭
+StorageMetals.Steel.name=강철 블럭
+StorageMetals.Ender.name=압축된 엔더 블럭
+
+tile.decoration.stonetorch.name=횃불
+tile.decoration.stoneladder.name=사다리
+tile.CraftingStation.name=조합 작업대
+
+block.glass.pure.name=깨끗한 유리
+block.glass.soul.name=소울 글래스
+block.glass.soul.pure.name=깨끗한 소울 글래스
+
+block.glass.pure.pane.name=Clear Glass Pane
+block.glass.soul.pane.name=Soul Pane
+block.glass.soul.pane.pure.name=Clear Soul Pane
+
+block.stainedglass.white.name=하얀색 스테인드글래스
+block.stainedglass.orange.name=주황색 스테인드글래스
+block.stainedglass.magenta.name=자홍색 스테인드글래스
+block.stainedglass.lightblue.name=하늘색 스테인드글래스
+block.stainedglass.yellow.name=노랑색 스테인드글래스
+block.stainedglass.lime.name=연두색 스테인드글래스
+block.stainedglass.pink.name=분홍색 스테인드글래스
+block.stainedglass.gray.name=회색 스테인드글래스
+block.stainedglass.lightgray.name=밝은 회색 스테인드글래스
+block.stainedglass.cyan.name=청록색 스테인드글래스
+block.stainedglass.purple.name=보라색 스테인드글래스
+block.stainedglass.blue.name=파랑색 스테인드글래스
+block.stainedglass.brown.name=갈색 스테인드글래스
+block.stainedglass.green.name=초록색 스테인드글래스
+block.stainedglass.red.name=빨강색 스테인드글래스
+block.stainedglass.black.name=검은색 스테인드글래스
+
+block.stainedglass.white.pane.name=하얀색 스테인드글래스판
+block.stainedglass.orange.pane.name=주황색 스테인드글래스판
+block.stainedglass.magenta.pane.name=자홍색 스테인드글래스판
+block.stainedglass.lightblue.pane.name=하늘색 스테인드글래스판
+block.stainedglass.yellow.pane.name=노랑색 스테인드글래스판
+block.stainedglass.lime.pane.name=연두색 스테인드글래스판
+block.stainedglass.pink.pane.name=분홍색 스테인드글래스판
+block.stainedglass.gray.pane.name=회색 스테인드글래스판
+block.stainedglass.lightgray.pane.name=밝은 회색 스테인드글래스판
+block.stainedglass.cyan.pane.name=청록색 스테인드글래스판
+block.stainedglass.purple.pane.name=보라색 스테인드글래스판
+block.stainedglass.blue.pane.name=파랑색 스테인드글래스판
+block.stainedglass.brown.pane.name=갈색 스테인드글래스판
+block.stainedglass.green.pane.name=초록색 스테인드글래스판
+block.stainedglass.red.pane.name=빨강색 스테인드글래스판
+block.stainedglass.black.pane.name=검은색 스테인드글래스판
+
+block.searedstone.slab.brick.name=타 버린 벽돌 반블럭
+block.searedstone.slab.stone.name=타 버린 돌 반블럭
+block.searedstone.slab.cobble.name=타 버린 도약돌 반블럭
+block.searedstone.slab.paver.name=타 버린 태두리가 조각돤 반블럭
+block.searedstone.slab.road.name=타 버린 도로 반블럭
+block.searedstone.slab.fancy.name=타 버린 세련된 반블럭
+block.searedstone.slab.square.name=타 버린 조각된 반블럭
+block.searedstone.slab.creeper.name=타 버린 조각된 반블럭
+
+block.soil.slab.dirt.name=흙 반블럭
+block.soil.slab.mycelium.name=균사체 반블럭
+block.soil.slab.slime.name=슬라임 진흙 반블럭
+block.soil.slab.grout.name=그라우트 반블럭
+block.soil.slab.blueslime.name=슬라임 진흙 반블럭
+block.soil.slab.graveyardsoil.name=죽은 흙 반블럭
+block.soil.slab.consecratedsoil.name=축성된 흙 반블럭
+
+block.slime.soil.blue.name=파란 슬라임흙
+block.slime.leaves.blue.name=끈적한 잎
+block.slime.sapling.bluegreen.name=끈적거리는 묘목
+block.slime.grass.blue.name=끈적거리는 잔디
+block.slime.grass.dirt.name=끈적거리는 잔디
+block.slime.tallgrass.name=끈적거리는 잔디
+block.slime.congealed.blue.name=굳어있는 파랑슬라임
+block.slime.congealed.green.name=굳어있는 초록슬라임
+block.slime.congealed.purple.name=굳어있는 보라슬라임
+
+item.tconstruct.storage.knapsack.name=가방
+item.tconstruct.blankpattern.pattern.name=빈 틀
+item.tconstruct.blankpattern.cast.name=빈 주조대
+
+item.tconstruct.Bowstring.string.name=활시위
+item.tconstruct.Bowstring.enchantedfabric.name=인챈트 활시위
+item.tconstruct.Bowstring.flamestring.name불의 활시위
+item.tconstruct.Fletching.feather.name=패더 플레치
+item.tconstruct.Fletching.leaf.name=리프 플레치
+item.tconstruct.Fletching.slime.name=슬라임 플레치
+item.tconstruct.Fletching.blueslime.name=슬라임 플레치
+
+item.tconstruct.manual.beginner.name=재료들과 당신
+item.tconstruct.manual.toolstation.name=재료들과 당신2
+item.tconstruct.manual.smeltery.name=강력한 제련
+item.tconstruct.manual.diary.name=땜장이의 일기
+
+item.tconstruct.bucket.Iron.name=액화 철 양동이
+item.tconstruct.bucket.Gold.name=액화 금 양동이
+item.tconstruct.bucket.Copper.name=액화 구리 양동이
+item.tconstruct.bucket.Tin.name=액화 주석 양동이
+item.tconstruct.bucket.Aluminum.name=액화 알루미늄 양동이
+item.tconstruct.bucket.Cobalt.name=액화 코발트 양동이
+item.tconstruct.bucket.Ardite.name=액화 아르다이트 양동이
+item.tconstruct.bucket.Bronze.name=액화 청동 양동이
+item.tconstruct.bucket.AluBrass.name=액화 알루미늄 황동 양동이
+item.tconstruct.bucket.Manyullyn.name=액화 마니율린 양동이
+item.tconstruct.bucket.Alumite.name=액화 알루마이트 양동이
+item.tconstruct.bucket.Obsidian.name=액화 흑요석 양동이
+item.tconstruct.bucket.Steel.name=액화 강철 양동이
+item.tconstruct.bucket.Glass.name=액화 유리 양동이
+item.tconstruct.bucket.Stone.name=타 버린 돌 양동이
+item.tconstruct.bucket.Villager.name=녹은 에메랄드 양동이
+item.tconstruct.bucket.Cow.name=피의 양동이
+item.tconstruct.bucket.Nickel.name=액화 백동 양동이
+item.tconstruct.bucket.Lead.name=액화 납 양동이
+item.tconstruct.bucket.Silver.name=액화 은 양동이
+item.tconstruct.bucket.Shiny.name=액화 백금 양동이
+item.tconstruct.bucket.Invar.name=액화 인바 양동이
+item.tconstruct.bucket.Electrum.name=액화 호박금 양동이
+item.tconstruct.bucket.Ender.name=녹은 엔더 양동이
+item.tconstruct.bucket.Slime.name=액체 슬라임 양동이
+item.tconstruct.bucket.PigIron.name=액화 선철 양동이
+item.tconstruct.bucket.Glue.name=끈적거리는 접착제 양동이
+
+item.tconstruct.bowstring.string.name=활시위
+item.tconstruct.bowstring.enchantedfabriI donc.name=인챈트 활시위
+
+tile.fluid.molten.iron.name=액화 철
+tile.fluid.molten.gold.name=액화 금
+tile.fluid.molten.copper.name=액화 구리
+tile.fluid.molten.tin.name=액화 주석
+tile.fluid.molten.aluminum.name=액화 알루미늄
+tile.fluid.molten.cobalt.name=액화 코발트
+tile.fluid.molten.ardite.name=액화 아르다이트
+tile.fluid.molten.bronze.name=액화 청동
+tile.fluid.molten.alubrass.name=액화 알루미늄 황동
+tile.fluid.molten.manyullyn.name=액화 마니율린
+tile.fluid.molten.alumite.name=액화 알루마이트
+tile.fluid.molten.obsidian.name=액화 흑요석
+tile.fluid.molten.steel.name=액화 강철
+tile.fluid.molten.glass.name=액화 유리
+tile.molten.stone.name=액화 타 버린 돌
+tile.molten.emerald.name=녹은 에메랄드
+tile.liquid.blood.name=피
+tile.fluid.molten.nickel.name=액화 백동
+tile.fluid.molten.silver.name=액화 은
+tile.fluid.molten.lead.name=액화 납
+tile.fluid.molten.shiny.name=액화 백금
+tile.fluid.molten.invar.name=액화 인바
+tile.fluid.molten.electrum.name=액화 호박금
+tile.fluid.ender.name=녹아버린 엔더
+tile.liquid.slime.name=녹아버린 슬라임
+
+LiquidMetal.Iron.name=액화 철
+LiquidMetal.Gold.name=액화 금
+LiquidMetal.Copper.name=액화 구리
+LiquidMetal.Tin.name=액화 주석
+LiquidMetal.Aluminum.name=액화 알루미늄
+LiquidMetal.Cobalt.name=액화 코발트
+LiquidMetal.Ardite.name=액화 아르다이트
+LiquidMetal.Bronze.name=액화 청동
+LiquidMetal.AluBrass.name=액화 알루미늄 황동
+LiquidMetal.Manyullyn.name=액화 마니율린
+LiquidMetal.Alumite.name=액화 알루마이트
+LiquidMetal.Obsidian.name=액화 흑요석
+LiquidMetal.Steel.name=액화 강철
+LiquidMetal.Glass.name=액화 유리
+LiquidMetal.Stone.name=타 버린 돌
+LiquidMetal.Villager.name=녹은 에메랄드
+LiquidMetal.Cow.name=Blo
+LiquidMetal.Nickel.name=액화 백동
+LiquidMetal.Silver.name=액화 은
+LiquidMetal.Lead.name=액화 납
+LiquidMetal.Shiny.name=액화 백금
+LiquidMetal.Invar.name=액화 인바
+LiquidMetal.Electrum.name=액화 호박금
+LiquidMetal.Ender.name=녹은 엔더
+
+item.food.apple.diamond.name=보석 사과
+item.tconstruct.strangefood.edibleslime.name=끈적거리는 슬라임
+item.tconstruct.strangefood.edibleblood.name=응고된 피
+item.tconstruct.strangefood.bacon.name=베이컨
+item.tconstruct.canister.empty.name=빈 캐니스터
+item.tconstruct.canister.miniheart.red.name=미니어쳐 레드 하트
+item.tconstruct.canister.red.name=빨강색 하트 캐니스터
+item.tconstruct.canister.miniheart.yellow.name=미니어쳐 옐로우 하트
+item.tconstruct.canister.yellow.name=노란색 하트 캐니스터
+item.tconstruct.canister.miniheart.green.name=미니어처 그린 캐니스트
+item.tconstruct.canister.green.name=초록색 하트 캐니스터
+item.tconstruct.glove.name=흙옮기는 장갑
+item.tconstruct.modifier.creative.name=크리에이티브 도구 모디파이어 추가
+
+SearedBlock.Table.name=캐스팅 테이블
+SearedBlock.Faucet.name=타 버린 꼭지
+SearedBlock.Basin.name=캐스팅 대야
+
+entity.TConstruct.EdibleSlime.name=블루 슬라임
+entity.TConstruct.KingSlime.name=킹 슬라임
+entity.TConstruct.Gardeslime.name=슬라임 가디언
+entity.TConstruct.MiniGardy.name=슬라임 가디언
+
+key.tconstruct.category=팅커스 컨스트럭트
+key.tarmor=갑옷 GUI
+key.tcapes.reload=재실행 caps
+key.tbelt=벨트
+key.tgoggles=고글
+key.tzoom=확대
+
+death.one.smeltery=%1$s가(이) 모든것이 초록색으로 보인다고 합니다
+death.two.smeltery=%1$s가(이) 용광로에 열기로 인한 사망
+death.three.smeltery=%1$s가(이) 돌과 함깨 합쳐져 버렸습니다!
+death.four.smeltery=%1$s, 그런곳에서 수영을 할 생각을 하다니!
+
+death.attack.Landmine=%1$s가(이) 지뢰에 걸려서 발모가지가 날라가 버렸습니다
+death.attack.FireworkExplode=%1$s가(이) 폭죽에 맞아서 사망 하셨습니다
+
+parttype.wood=나무
+parttype.stone=돌
+parttype.iron=철
+parttype.flint=부싯돌
+parttype.cactus=선인장
+parttype.bone=뼈
+parttype.obsidian=흑요석
+parttype.slime=슬라임
+parttype.paper=종이
+parttype.netherrack=네더랙
+parttype.cobalt=코발트
+parttype.ardite=아르다이트
+parttype.manyullyn=마니율린
+parttype.copper=구리
+parttype.bronze=청동
+parttype.alumite=알루마이트
+parttype.steel=강철
+parttype.blueslime=슬라임
+parttype.thaumium=타우미늄
+parttype.pigiron=선철
+
+toolpart.ToolRod=%%material 도구 손잡이
+toolpart.PickHead=%%material 곡괭이 머리
+toolpart.ShovelHead=%%material 삽 머리
+toolpart.AxeHead=%%material 도끼 머리
+toolpart.Binding=%%material 연결부
+toolpart.ToughBind=%%material 강한 연결 부
+toolpart.ToughRod=%%material 강한 손잡이
+toolpart.LargePlate=%%material 커다란 판
+toolpart.SwordBlade=%%material 검 날
+toolpart.LargeGuard=%%material 와이드가드
+toolpart.MediumGuard=%%material 핸드가드
+toolpart.Crossbar=%%material 가로대
+toolpart.KnifeBlade=%%material 검 날
+toolpart.FullGuard=%%material 풀가드
+toolpart.FrypanHead=%%material 팬
+toolpart.SignHead=%%material 표지판 머리
+toolpart.ChiselHead=%%material 조각칼 머리
+toolpart.ScytheHead=%%material 낫 머리
+toolpart.LumberHead=%%material 큰 도끼 머리
+toolpart.ExcavatorHead=%%material 굴삭 삽 머리
+toolpart.ToolShard=%%material 조각
+toolpart.LargeSwordBlade=%%material 큰 검 날
+toolpart.HammerHead=%%material 망치 머리
+toolpart.Bowstring=%%material 활시위
+toolpart.ArrowHead=%%material 화살 머리
+toolpart.Fletching=%%material 화살 깃
+
+fluid.iron.molten=액화 철
+fluid.gold.molten=액화 금
+fluid.copper.molten=액화 구리
+fluid.tin.molten=액화 주석
+fluid.aluminum.molten=액화 알루미늄
+fluid.cobalt.molten=액화 코발트
+fluid.ardite.molten=액화 아르다이트
+fluid.bronze.molten=액화 청동
+fluid.aluminumbrass.molten=액화 알루미늄 황동
+fluid.manyullyn.molten=액화 마니율린
+fluid.alumite.molten=액화 알루마이트
+fluid.obsidian.molten=액화 흑요석
+fluid.steel.molten=액화 강철
+fluid.glass.molten=액화 유리
+fluid.stone.seared=타 버린 돌
+fluid.emerald.liquid=액체 에메랄드
+fluid.blood=피
+fluid.nickel.molten=액화 백동
+fluid.lead.molten=액화 납
+fluid.silver.molten=액화 은
+fluid.shiny.molten=액화 백금
+fluid.invar.molten=액화 인바
+fluid.electrum.molten=액화 호박금
+fluid.ender=녹아버린 엔더
+fluid.slime.blue=녹은 블루슬라임
+fluid.pigiron.molten=선철
+fluid.glue=접착제
+
+tconstruct.achievementPage.name=팅커스 컨스트럭트
+achievement.tconstruct.beginner=땜장이의 가르침
+achievement.tconstruct.pattern=틀 제작자
+achievement.tconstruct.tinkerer=대장장이
+achievement.tconstruct.proTinkerer=프로 대장장이
+achievement.tconstruct.smelteryMaker=용광로 제작
+achievement.tconstruct.preparedFight=싸울 준비
+achievement.tconstruct.enemySlayer=몬스터 슬레이어
+achievement.tconstruct.dualConvenience=이중 편의
+achievement.tconstruct.doingItWrong=잘못된 시작
+achievement.tconstruct.betterCrafting=더 나은 제작
+
+achievement.tconstruct.beginner.desc="재료와 당신"책 열기
+achievement.tconstruct.pattern.desc=첫 빈 틀 제작
+achievement.tconstruct.tinkerer.desc=당신의 첫 도구를 만드세요
+achievement.tconstruct.proTinkerer.desc=당신의 첫 티어2 도구를 만드세요
+achievement.tconstruct.smelteryMaker.desc=용광로를 제작하세요
+achievement.tconstruct.preparedFight.desc=첫 무기를 만드세요
+achievement.tconstruct.enemySlayer.desc=몬스터를 죽이세요
+achievement.tconstruct.dualConvenience.desc=프라이팬으로 몬스터를 죽인후에, 고기요리를 하세요
+achievement.tconstruct.doingItWrong.desc=당신을 잘못 했어요!
+achievement.tconstruct.betterCrafting.desc=작업 조합대를 제작하세요
+
+knapsack.tooltip=물건을 넣는 배낭
+strangefood1.tooltip=이것에서 끔찍한 냄새가 납니다
+strangefood2.tooltip=먹을만한 곳이 아무대도 없다...
+strangefood3.tooltip=어떻게든 다 먹을 수 있을꺼 같긴 하지만..
+strangefood4.tooltip=매력적이지 못하세요
+strangefood5.tooltip=이런 쫄깃화다 못해 신축성 있는 음식!
+strangefood6.tooltip=뱀파이어를 위한 에피타이저
+strangefood7.tooltip=신비로운 간식
+hambone1.tooltip=햄본!!
+hambone2.tooltip=신호기의 베이스로 사용하실 수 있습니다
+metalblock.tooltip=신호기의 베이스로 사용하실 수 있습니다
+craftedsoil1.tooltip=언데드를 회복
+craftedsoil2.tooltip=언데드들의 유해
+fancybrick1.tooltip=다소 비싸군요
+fancybrick2.tooltip=매우 비싸네요
+fancybrick3.tooltip=레드스톤 최대신호(15)를 보냅니다
+fancybrick4.tooltip=4 블록
+fancybrick5.tooltip=탄력!
+brick1.tooltip=다소 비싸군요
+brick2.tooltip=매우 비싸네요
+brick3.tooltip=레드스톤 최대신호(15)를 보냅니다
+brick4.tooltip=4 블록
+brick5.tooltip=탄력!
+craftedsoil.slab1.tooltip=언데드를 회복
+craftedsoil.slab2.tooltip=언데드들의 유해
+speedblock1.tooltip=당신은 매우 빠르게 달릴수 있을 겁니다
+speedblock2.tooltip=위에서 달리면 매우 빠르죠
+speedblock.slab1.tooltip=당신은 매우 빠르게 달릴수 있을 겁니다
+speedblock.slab2.tooltip=위에서 달리면 매우 빠르죠
+manual1.tooltip=By: Skyla
+manual2.tooltip=By: Skyla
+manual3.tooltip=By: Thruul M'gon
+searedtank1.tooltip=포함
+searedtank2.tooltip=부셔도 액체를 저장
+oreberries1.tooltip=달콤한 거짓말
+oreberries2.tooltip=순수 광택
+oreberries3.tooltip=금속 맛
+oreberries4.tooltip=주석 남자
+oreberries5.tooltip=화이트 초콜릿
+oreberries6.tooltip=크리퍼 맛
+item.crafting.tooltip=아이템 제작
+item.accessory.tooltip=액세서리
+canister.tooltip=최대 하트 증가
+canister.red.tooltip1=낮은 수준의 하트 캐니스터 부품
+canister.red.tooltip2=최대하트를 10하트까지 키울수 있습니다
+canister.yellow.tooltip1=중간 수준의 하트 캐니스터 부품
+canister.yellow.tooltip2=최대하트를 20하트까지 키울수 있습니다
+canister.green.tooltip1=높은 수준의 하트 캐니스터 부품
+canister.green.tooltip2=최대하트를 30하트까지 키울수 있습니다
+landmine1.tooltip=모두
+landmine2.tooltip=몬스터, 플레이어 그리고 레드스톤 신호
+landmine3.tooltip=플레이어와 레드스톤
+landmine4.tooltip=레드스톤 만
+landmine5.tooltip=작동 방법:
+goldenhead1.tooltip=일부의 머리를 소비
+goldenhead2.tooltip=떨어진 채력을 회복
+oreberrybush1.tooltip=달콤한 거짓말
+oreberrybush2.tooltip=순수 광택
+oreberrybush3.tooltip=금속 맛
+oreberrybush4.tooltip=주석 남자
+oreberrybush5.tooltip=화이트 초콜릿
+oreberrybush6.tooltip=크리퍼 맛
+barricade.tooltip=4개까지 곂칠수 있음
+pattern1.tooltip=필요한 재료:
+pattern2.tooltip=필요한 재료:
+potionlauncher.tooltip=테스트중
+smeltery.controller.tooltip=용광로의 머리
+smeltery.drain.tooltip1=어디서든지 입출력이 가능함
+smeltery.drain.tooltip2=용광로 속 의 액체
+smeltery.brick.tooltip1=용광로 구조블럭
+smeltery.brick.tooltip2=(장식용)
+
+gui.smeltery.fuel=연료
+gui.smeltery.emerald=에메랄드:
+gui.smeltery.glass.block=블럭:
+gui.smeltery.glass.pannel=판:
+gui.smeltery.metal.ingot=주괴:
+gui.smeltery.metal.nugget=조각:
+gui.smeltery.molten.check=녹은
+gui.landmine=지뢰
+gui.partcrafter1=도구 부품 제작
+gui.partcrafter2=도구 부품 제작소
+gui.partcrafter3=왼쪽의 틀을 놓고 오른쪽에 재료를 놓습니다
+gui.partcrafter4=기본 내구도:
+gui.partcrafter5=핸들 모디파이어:
+gui.partcrafter6=채광 속도:
+gui.partcrafter7=채광 레벨:
+gui.partcrafter8= 하트
+gui.partcrafter9= 하트
+gui.partcrafter10=공격력:
+gui.partcrafter.mining1=돌
+gui.partcrafter.mining2=철
+gui.partcrafter.mining3=레드스톤
+gui.partcrafter.mining4=흑요석
+gui.partcrafter.mining5=코발트
+gui.partcrafter.mining6=마니율린
+gui.stenciltable1=다음 틀
+gui.stenciltable2=이전 틀
+gui.toolforge1=수리 및 도구 기능 추가
+gui.toolforge2=당신이 도구를 수리하거나 변경하는 방법, 왼쪽에 도구와 재료를 넣습니다.
+gui.toolstation1=내구도:
+gui.toolstation2=내구도:
+gui.toolstation3=공격력:
+gui.toolstation4=보너스:
+gui.toolstation5=손실:
+gui.toolstation6=당기는 속도:
+gui.toolstation7=화살 속도:
+gui.toolstation8=무게:
+gui.toolstation9=정확호:
+gui.toolstation10=기본 공격력:
+gui.toolstation11=쇼트보우 공격력:
+gui.toolstation12=채광 레벨:
+gui.toolstation13=수확 레벨:
+gui.toolstation14=채광 속도:
+gui.toolstation15=채광 레벨:
+gui.toolstation16=사용 속도:
+gui.toolstation17=모디파이어
+gui.toolstation18=재수정:
+
+gui.partbuilder.material.wood=나무
+gui.partbuilder.material.stone=돌
+gui.partbuilder.material.iron=철
+gui.partbuilder.material.flint=부싯돌
+gui.partbuilder.material.cactus=선인장
+gui.partbuilder.material.bone=뼈
+gui.partbuilder.material.obsidian=흑요석
+gui.partbuilder.material.netherrack=네더랙
+gui.partbuilder.material.slime=슬라임
+gui.partbuilder.material.paper=종이
+gui.partbuilder.material.blueslime=블루슬라임ㅁ
+gui.partbuilder.material.cobalt=코발트
+gui.partbuilder.material.ardite=아르다이트
+gui.partbuilder.material.manyullyn=마니율린
+gui.partbuilder.material.copper=구리
+gui.partbuilder.material.bronze=청동
+gui.partbuilder.material.alumite=알루마이트
+gui.partbuilder.material.steel=강철
+gui.partbuilder.material.pigiron=선철
+gui.partbuilder.material.thaumium=타우미늄
+
+gui.modifier.blaze=블레이즈
+gui.modifier.silk=실크터치
+gui.modifier.lapis=라피즈
+gui.modifier.redstone=레드스톤
+gui.modifier.diamond=다이아몬드
+gui.modifier.emerald=에메랄드
+gui.modifier.moss=이끼
+gui.modifier.lava=용암
+gui.modifier.necro=네크로메틱
+gui.modifier.spider=안티 스파이더
+gui.modifier.quartz=석영
+
+modifier.armour.jump.double=더블점프
+modifier.armour.jump.triple=트리플점프
+modifier.armour.jump.quad=쿼드라점프
+modifier.armour.protection=보호
+modifier.tool.spider=살충
+modifier.tool.quartz=날카로움
+modifier.tool.blaze=화염
+modifier.tool.silk=섬세한 손길
+mofifier.tool.flux=흐름
+modifier.tool.lapis=행운
+modifier.tool.piston=넉백
+modifier.tool.redstone=가속
+modifier.tool.reinforced=강화
+modifier.tool.unbreaking=단단한
+modifier.tool.smite=강타
+modifier.tool.diamond=내구도 +500
+modifier.tool.emerald=내구도 +50%
+modifier.tool.moss=자동수리
+modifier.tool.lava=오토스멜터
+modifier.tool.necro=생명 강탈
+modifier.tool.beheading=참구
+
+materialtraits.stonebound=스톤바운드
+materialtraits.jagged=뾰족뾰족
+materialtraits.writable=하얀색
+materialtraits.tasty=맛있음
+materialtraits.thaumic=마법
+
+creativeModLock.tooltip=타겟 설정:
+
+attribute.generic.ammo.attackDamage=평균 데미지
diff --git a/resources/assets/tinker/manuals/materials.xml b/resources/assets/tinker/manuals/materials.xml
index 03d13fd5..3b7c2f2c 100644
--- a/resources/assets/tinker/manuals/materials.xml
+++ b/resources/assets/tinker/manuals/materials.xml
@@ -1006,7 +1006,7 @@ Stackable: Yes
Effects:
- Allows the tool to be charged with Redstone Flux
- Uses energy instead of durability while charged
-- Available from Thermal Expansion 3
+- Available from Thermal Expansion
Type: Single-use
Stackable: No
@@ -1024,7 +1024,7 @@ Stackable: No
Effects:
- Allows the tool to be charged with Redstone Flux
- Uses energy instead of durability while charged
-- Available from Thermal Expansion 3
+- Available from Thermal Expansion
Type: Single-use
Stackable: No
@@ -1100,4 +1100,4 @@ Stackable: Yes
creativefree
-
\ No newline at end of file
+
diff --git a/resources/assets/tinker/textures/blocks/liquid_glue.png.mcmeta b/resources/assets/tinker/textures/blocks/liquid_glue.png.mcmeta
index 4f0718ac..04867655 100644
--- a/resources/assets/tinker/textures/blocks/liquid_glue.png.mcmeta
+++ b/resources/assets/tinker/textures/blocks/liquid_glue.png.mcmeta
@@ -1,3 +1,45 @@
{
- "animation": {}
-}
\ No newline at end of file
+ "animation": {
+ "frametime": 2,
+ "frames": [
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12,
+ 13,
+ 14,
+ 15,
+ 16,
+ 17,
+ 18,
+ 19,
+ 18,
+ 17,
+ 16,
+ 15,
+ 14,
+ 13,
+ 12,
+ 11,
+ 10,
+ 9,
+ 8,
+ 7,
+ 6,
+ 5,
+ 4,
+ 3,
+ 2,
+ 1
+ ]
+ }
+}
diff --git a/resources/assets/tinker/textures/blocks/liquid_glue_flow.png.mcmeta b/resources/assets/tinker/textures/blocks/liquid_glue_flow.png.mcmeta
index 4f0718ac..8e55e43b 100644
--- a/resources/assets/tinker/textures/blocks/liquid_glue_flow.png.mcmeta
+++ b/resources/assets/tinker/textures/blocks/liquid_glue_flow.png.mcmeta
@@ -1,3 +1,5 @@
{
- "animation": {}
-}
\ No newline at end of file
+ "animation": {
+ "frametime": 3
+ }
+}
diff --git a/resources/assets/tinker/textures/blocks/liquid_villager.png.mcmeta b/resources/assets/tinker/textures/blocks/liquid_villager.png.mcmeta
index 4f0718ac..04867655 100644
--- a/resources/assets/tinker/textures/blocks/liquid_villager.png.mcmeta
+++ b/resources/assets/tinker/textures/blocks/liquid_villager.png.mcmeta
@@ -1,3 +1,45 @@
{
- "animation": {}
-}
\ No newline at end of file
+ "animation": {
+ "frametime": 2,
+ "frames": [
+ 0,
+ 1,
+ 2,
+ 3,
+ 4,
+ 5,
+ 6,
+ 7,
+ 8,
+ 9,
+ 10,
+ 11,
+ 12,
+ 13,
+ 14,
+ 15,
+ 16,
+ 17,
+ 18,
+ 19,
+ 18,
+ 17,
+ 16,
+ 15,
+ 14,
+ 13,
+ 12,
+ 11,
+ 10,
+ 9,
+ 8,
+ 7,
+ 6,
+ 5,
+ 4,
+ 3,
+ 2,
+ 1
+ ]
+ }
+}
diff --git a/resources/assets/tinker/textures/blocks/liquid_villager_flow.png.mcmeta b/resources/assets/tinker/textures/blocks/liquid_villager_flow.png.mcmeta
index 0645f48c..8e55e43b 100644
--- a/resources/assets/tinker/textures/blocks/liquid_villager_flow.png.mcmeta
+++ b/resources/assets/tinker/textures/blocks/liquid_villager_flow.png.mcmeta
@@ -1,5 +1,5 @@
{
"animation": {
- "frametime": 2
+ "frametime": 3
}
}
diff --git a/returning_eventually/plugins/PluginController.java b/returning_eventually/plugins/PluginController.java
deleted file mode 100644
index 42750d3e..00000000
--- a/returning_eventually/plugins/PluginController.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package tconstruct.plugins;
-
-import static tconstruct.TConstruct.moduleLoader;
-import tconstruct.plugins.ic2.IC2;
-import tconstruct.plugins.imc.AppEng;
-import tconstruct.plugins.imc.BuildcraftTransport;
-import tconstruct.plugins.imc.Mystcraft;
-import tconstruct.plugins.imc.Thaumcraft;
-import tconstruct.plugins.nei.NotEnoughItems;
-import tconstruct.plugins.te3.ThermalExpansion;
-import tconstruct.plugins.waila.Waila;
-
-public class PluginController
-{
-
- private PluginController() {} // Don't need to instantiate this.
-
- public static void registerModules()
- {
- // Mystcraft is pushed in through the backdoor so it can't be disabled.
- moduleLoader.registerUncheckedModule(Mystcraft.class);
-
- // Register the remaining plugin classes normally
- moduleLoader.registerModule(AppEng.class);
- moduleLoader.registerModule(BuildcraftTransport.class);
- moduleLoader.registerModule(IC2.class);
- moduleLoader.registerModule(Thaumcraft.class);
- moduleLoader.registerModule(NotEnoughItems.class);
- moduleLoader.registerModule(Waila.class);
- moduleLoader.registerModule(ThermalExpansion.class);
- }
-
-}
diff --git a/returning_eventually/plugins/imc/AppEng.java b/returning_eventually/plugins/imc/AppEng.java
deleted file mode 100644
index db5820e5..00000000
--- a/returning_eventually/plugins/imc/AppEng.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package tconstruct.plugins.imc;
-
-import java.util.Arrays;
-import java.util.List;
-
-import mantle.module.ILoadableModule;
-import tconstruct.TConstruct;
-import cpw.mods.fml.common.event.FMLInterModComms;
-
-public class AppEng implements ILoadableModule
-{
-
- private static List spatialIOLogics = Arrays.asList("AdaptiveSmelteryLogic", "AqueductLogic", "CastingBasinLogic", "CastingChannelLogic", "CastingTableLogic", "CraftingStationLogic",
- "DryingRackLogic", "EssenceExtractorLogic", "FaucetLogic", "FrypanLogic", "GolemPedestalLogic", "LavaTankLogic", "PartBuilderLogic", "PatternChestLogic", "SmelteryDrainLogic",
- "SmelteryLogic", "StencilTableLogic", "TankAirLogic", "TileEntityLandmine", "ToolForgeLogic", "ToolStationLogic", "TowerFurnaceLogic", "MultiServantLogic");
-
- @SuppressWarnings("unused")
- public static String modId = "AppliedEnergistics";
-
- @Override
- public void preInit ()
- {
-
- }
-
- @Override
- public void init ()
- {
- TConstruct.logger.info("[AppEng] Registering for Spatial IO.");
- for (String s : spatialIOLogics)
- {
- FMLInterModComms.sendMessage("AppliedEnergistics", "movabletile", "tconstruct.blocks.logic." + s);
- }
- }
-
- @Override
- public void postInit ()
- {
-
- }
-
-}
diff --git a/returning_eventually/plugins/imc/BuildcraftTransport.java b/returning_eventually/plugins/imc/BuildcraftTransport.java
deleted file mode 100644
index 10d723ee..00000000
--- a/returning_eventually/plugins/imc/BuildcraftTransport.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package tconstruct.plugins.imc;
-
-import mantle.module.ILoadableModule;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import tconstruct.TConstruct;
-import tconstruct.common.TRepo;
-import cpw.mods.fml.common.event.FMLInterModComms;
-
-public class BuildcraftTransport implements ILoadableModule
-{
-
- @SuppressWarnings("unused")
- public static String modId = "BuildCraft|Transport";
-
- @Override
- public void preInit ()
- {
-
- }
-
- @Override
- public void init ()
- {
- TConstruct.logger.info("[BC|Transport] Registering facades.");
- // Smeltery Blocks
- addFacade(TRepo.smeltery, 2);
- for (int sc = 4; sc < 11; sc++)
- {
- addFacade(TRepo.smeltery, sc);
- }
-
- addFacade(TRepo.searedBlock, 0);
- addFacade(TRepo.searedBlockNether, 0);
- }
-
- @Override
- public void postInit ()
- {
-
- }
-
- private void addFacade (Block b, int meta)
- {
- FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", new ItemStack(b, 1, meta));
- }
-
-}
diff --git a/returning_eventually/plugins/imc/Thaumcraft.java b/returning_eventually/plugins/imc/Thaumcraft.java
deleted file mode 100644
index a70e1df5..00000000
--- a/returning_eventually/plugins/imc/Thaumcraft.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package tconstruct.plugins.imc;
-
-import mantle.module.ILoadableModule;
-import net.minecraft.item.ItemStack;
-import tconstruct.TConstruct;
-import tconstruct.common.TRepo;
-import cpw.mods.fml.common.event.FMLInterModComms;
-
-public class Thaumcraft implements ILoadableModule
-{
-
- @SuppressWarnings("unused")
- public static String modId = "Thaumcraft";
-
- @Override
- public void preInit ()
- {
-
- }
-
- @Override
- public void init ()
- {
- TConstruct.logger.info("[Thaumcraft] Registering harvestables.");
- FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TRepo.oreBerry, 1, 12));
- FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TRepo.oreBerry, 1, 13));
- FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TRepo.oreBerry, 1, 14));
- FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TRepo.oreBerry, 1, 15));
- FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TRepo.oreBerrySecond, 1, 12));
- FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TRepo.oreBerrySecond, 1, 13));
- }
-
- @Override
- public void postInit ()
- {
-
- }
-
-}
diff --git a/returning_eventually/plugins/minefactoryreloaded/MFRRegister.java b/returning_eventually/plugins/minefactoryreloaded/MFRRegister.java
deleted file mode 100644
index 7c40fc1c..00000000
--- a/returning_eventually/plugins/minefactoryreloaded/MFRRegister.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package tconstruct.plugins.minefactoryreloaded;
-
-import powercrystals.minefactoryreloaded.api.FactoryRegistry;
-import tconstruct.common.TRepo;
-
-public class MFRRegister
-{
- public static void registerWithMFR ()
- {
- FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TRepo.oreBerry.blockID, TRepo.oreBerries.itemID, 0));
- FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TRepo.oreBerrySecond.blockID, TRepo.oreBerries.itemID, 4));
- FactoryRegistry.registerGrindable(new GrindableHorse());
- FactoryRegistry.registerLiquidDrinkHandler(TRepo.bloodFluid.getName(), new Drinkables());
- }
-}
diff --git a/returning_eventually/plugins/nei/NotEnoughItems.java b/returning_eventually/plugins/nei/NotEnoughItems.java
deleted file mode 100644
index 7fd6f01b..00000000
--- a/returning_eventually/plugins/nei/NotEnoughItems.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package tconstruct.plugins.nei;
-
-import codechicken.nei.api.API;
-import codechicken.nei.recipe.DefaultOverlayHandler;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.relauncher.Side;
-import mantle.module.ILoadableModule;
-import tconstruct.TConstruct;
-import tconstruct.client.gui.CraftingStationGui;
-
-public class NotEnoughItems implements ILoadableModule
-{
- @SuppressWarnings("unused")
- public static String modId = "NotEnoughItems";
-
- @Override
- public void preInit() {
- // Nothing
- }
-
- @Override
- public void init() {
- TConstruct.logger.info("NotEnoughItems detected. Registering TConstruct NEI plugin.");
- registerNEICompat();
- }
-
- @Override
- public void postInit() {
- // Nothing
- }
- public static void registerNEICompat ()
- {
- if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)
- {
- API.registerGuiOverlay(CraftingStationGui.class, "crafting");
- API.registerGuiOverlayHandler(CraftingStationGui.class, new DefaultOverlayHandler(), "crafting");
- }
- }
-
-
-}
diff --git a/returning_eventually/plugins/te3/TE3Helper.java b/returning_eventually/plugins/te3/TE3Helper.java
deleted file mode 100644
index 0f43e7f2..00000000
--- a/returning_eventually/plugins/te3/TE3Helper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package tconstruct.plugins.te3;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import cpw.mods.fml.common.event.FMLInterModComms;
-
-public class TE3Helper {
-
- public static void addInductionSmelterRecipe(int energy, ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2, int chance)
- {
- NBTTagCompound data = new NBTTagCompound();
-
- data.setInteger("energy", energy);
-
- NBTTagCompound input1Compound = new NBTTagCompound();
- input1.writeToNBT(input1Compound);
- data.setTag("primaryInput", input1Compound);
-
- NBTTagCompound input2Compound = new NBTTagCompound();
- input2.writeToNBT(input2Compound);
- data.setTag("secondaryInput", input2Compound);
-
- NBTTagCompound output1Compound = new NBTTagCompound();
- output1.writeToNBT(output1Compound);
- data.setTag("primaryOutput", output1Compound);
-
- if (output2 != null) {
- NBTTagCompound output2Compound = new NBTTagCompound();
- output2.writeToNBT(output2Compound);
- data.setTag("secondaryOutput", output2Compound);
-
- data.setInteger("secondaryChance", chance);
- }
-
- FMLInterModComms.sendMessage("ThermalExpansion", "SmelterRecipe", data);
- }
-
- public static void addPulveriserRecipe(int energy, ItemStack input, ItemStack output, ItemStack bonus, int chance)
- {
- NBTTagCompound data = new NBTTagCompound();
-
- data.setInteger("energy", energy);
-
- NBTTagCompound inputCompound = new NBTTagCompound();
- input.writeToNBT(inputCompound);
- data.setTag("input", inputCompound);
-
- NBTTagCompound outputCompound = new NBTTagCompound();
- output.writeToNBT(outputCompound);
- data.setTag("primaryOutput", outputCompound);
-
- if (bonus != null) {
- NBTTagCompound outputCompound2 = new NBTTagCompound();
- bonus.writeToNBT(outputCompound2);
- data.setTag("secondaryOutput", outputCompound2);
-
- data.setInteger("secondaryChance", chance);
- }
-
- FMLInterModComms.sendMessage("ThermalExpansion", "PulverizerRecipe", data);
- }
-}
\ No newline at end of file
diff --git a/returning_eventually/plugins/te3/ThermalExpansion.java b/returning_eventually/plugins/te3/ThermalExpansion.java
deleted file mode 100644
index cecf27ec..00000000
--- a/returning_eventually/plugins/te3/ThermalExpansion.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package tconstruct.plugins.te3;
-
-import tconstruct.common.TRepo;
-import cpw.mods.fml.common.registry.GameRegistry;
-import mantle.module.ILoadableModule;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-public class ThermalExpansion implements ILoadableModule
-{
-
- @SuppressWarnings("unused")
- public static String modId = "ThermalExpansion";
-
- @Override
- public void preInit() {
- // Nothing
- }
-
- @Override
- public void init()
- {
- ItemStack crystalCinnabar = OreDictionary.getOres("crystalCinnabar").get(0);
-
- TE3Helper.addPulveriserRecipe(1000, new ItemStack(TRepo.materials, 1, 11), new ItemStack(TRepo.materials, 1, 40), null, 0);
- TE3Helper.addPulveriserRecipe(1000, new ItemStack(TRepo.materials, 1, 3), new ItemStack(TRepo.materials, 1, 39), null, 0);
- TE3Helper.addPulveriserRecipe(1000, new ItemStack(TRepo.materials, 1, 4), new ItemStack(TRepo.materials, 1, 38), null, 0);
-
- TE3Helper.addPulveriserRecipe(12000, new ItemStack(TRepo.oreSlag, 1, 1), new ItemStack(TRepo.materials, 2, 39), GameRegistry.findItemStack("ThermalExpansion", "dustIron", 1), 10);
- TE3Helper.addInductionSmelterRecipe(12000, new ItemStack(TRepo.oreSlag, 1, 1), crystalCinnabar.copy(), new ItemStack(TRepo.materials, 3, 3), new ItemStack(Items.iron_ingot), 100);
- TE3Helper.addPulveriserRecipe(12000, new ItemStack(TRepo.oreSlag, 1, 2), new ItemStack(TRepo.materials, 2, 38), GameRegistry.findItemStack("ThermalExpansion", "dustGold", 1), 10);
- TE3Helper.addInductionSmelterRecipe(12000, new ItemStack(TRepo.oreSlag, 1, 2), crystalCinnabar.copy(), new ItemStack(TRepo.materials, 3, 4), new ItemStack(Items.gold_ingot), 100);
-
- TE3Helper.addInductionSmelterRecipe(4000, new ItemStack(TRepo.materials, 1, 4), new ItemStack(TRepo.materials, 1, 3), new ItemStack(TRepo.materials, 1, 5), null, 0);
- TE3Helper.addInductionSmelterRecipe(4000, new ItemStack(TRepo.materials, 1, 9), new ItemStack(TRepo.materials, 3, 11), new ItemStack(TRepo.materials, 4, 14), null, 0);
- } @Override
- public void postInit() {
- // Nothing
- }
-
-
-}
diff --git a/returning_eventually/plugins/waila/Waila.java b/returning_eventually/plugins/waila/Waila.java
deleted file mode 100644
index c0b3f208..00000000
--- a/returning_eventually/plugins/waila/Waila.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package tconstruct.plugins.waila;
-
-import mantle.module.ILoadableModule;
-import cpw.mods.fml.common.event.FMLInterModComms;
-import tconstruct.TConstruct;
-
-public class Waila implements ILoadableModule
-{
- @SuppressWarnings("unused")
- public static String modId = "Waila";
-
- @Override
- public void preInit ()
- {
- // Nothing
- }
-
- @Override
- public void init ()
- {
- TConstruct.logger.info("Waila detected. Registering TConstruct tank blocks with Waila registry.");
-
- FMLInterModComms.sendMessage("Waila", "register", "tconstruct.plugins.waila.WailaRegistrar.wailaCallback");
- }
-
- @Override
- public void postInit ()
- {
- // Nothing
- }
-
-
-
-}
diff --git a/src/api/java/cofh/api/energy/IEnergyContainerItem.java b/src/api/java/cofh/api/energy/IEnergyContainerItem.java
index d40c0999..0bcfda60 100644
--- a/src/api/java/cofh/api/energy/IEnergyContainerItem.java
+++ b/src/api/java/cofh/api/energy/IEnergyContainerItem.java
@@ -10,43 +10,43 @@ import net.minecraft.item.ItemStack;
* @author King Lemming
*
*/
-public interface IEnergyContainerItem
-{
+public interface IEnergyContainerItem {
- /**
- * Adds energy to an item. Returns the quantity of energy that was accepted. This should always return 0 if the item cannot be externally charged.
- *
- * @param container
- * ItemStack to be charged.
- * @param maxReceive
- * Maximum amount of energy to be sent into the item.
- * @param simulate
- * If TRUE, the charge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) received by the item.
- */
- int receiveEnergy (ItemStack container, int maxReceive, boolean simulate);
+ /**
+ * Adds energy to a container item. Returns the quantity of energy that was accepted. This should always return 0 if the item cannot be externally charged.
+ *
+ * @param container
+ * ItemStack to be charged.
+ * @param maxReceive
+ * Maximum amount of energy to be sent into the item.
+ * @param simulate
+ * If TRUE, the charge will only be simulated.
+ * @return Amount of energy that was (or would have been, if simulated) received by the item.
+ */
+ int receiveEnergy(ItemStack container, int maxReceive, boolean simulate);
- /**
- * Removes energy from an item. Returns the quantity of energy that was removed. This should always return 0 if the item cannot be externally discharged.
- *
- * @param container
- * ItemStack to be discharged.
- * @param maxExtract
- * Maximum amount of energy to be extracted from the item.
- * @param simulate
- * If TRUE, the discharge will only be simulated.
- * @return Amount of energy that was (or would have been, if simulated) extracted from the item.
- */
- int extractEnergy (ItemStack container, int maxExtract, boolean simulate);
+ /**
+ * Removes energy from a container item. Returns the quantity of energy that was removed. This should always return 0 if the item cannot be externally
+ * discharged.
+ *
+ * @param container
+ * ItemStack to be discharged.
+ * @param maxExtract
+ * Maximum amount of energy to be extracted from the item.
+ * @param simulate
+ * If TRUE, the discharge will only be simulated.
+ * @return Amount of energy that was (or would have been, if simulated) extracted from the item.
+ */
+ int extractEnergy(ItemStack container, int maxExtract, boolean simulate);
- /**
- * Get the amount of energy currently stored in the item.
- */
- int getEnergyStored (ItemStack container);
+ /**
+ * Get the amount of energy currently stored in the container item.
+ */
+ int getEnergyStored(ItemStack container);
- /**
- * Get the max amount of energy that can be stored in the item.
- */
- int getMaxEnergyStored (ItemStack container);
+ /**
+ * Get the max amount of energy that can be stored in the container item.
+ */
+ int getMaxEnergyStored(ItemStack container);
-}
\ No newline at end of file
+}
diff --git a/src/api/java/morph/api/Ability.java b/src/api/java/morph/api/Ability.java
index 5120ddbd..36a75e9b 100644
--- a/src/api/java/morph/api/Ability.java
+++ b/src/api/java/morph/api/Ability.java
@@ -193,82 +193,16 @@ public abstract class Ability
}
/**
- * The following are helper functions to create abilities packaged with Morph.
- * Use these to ability instances for mapping vanilla abilities to mobs.
- * Self explanatory.
+ * Creates an ability by type.
+ * Check out AbilityHandler to see each Ability type and the parse function in their respective classes for the arguments.
* @return
*/
- public static Ability getNewAbilityClimb()
- {
- try {
- return (Ability)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("getNewAbilityClimb").invoke(null);
- } catch (Exception e) {
- return null;
- }
- }//TODO add new abilities
- public static Ability getNewAbilityFireImmunity()
- {
- try {
- return (Ability)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("getNewAbilityFireImmunity").invoke(null);
- } catch (Exception e) {
- return null;
- }
- }
- public static Ability getNewAbilityFloat(float terminalVelocity, boolean negateFallDamage)
- {
- try {
- return (Ability)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("getNewAbilityFloat", float.class, boolean.class).invoke(null, terminalVelocity, negateFallDamage);
- } catch (Exception e) {
- return null;
- }
- }
- public static Ability getNewAbilityFly(boolean slowdownInWater)
- {
- try {
- return (Ability)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("getNewAbilityFly", boolean.class).invoke(null, slowdownInWater);
- } catch (Exception e) {
- return null;
- }
- }
- public static Ability getNewAbilityFly()
- {
- try {
- return (Ability)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("getNewAbilityFly", boolean.class).invoke(null, true);
- } catch (Exception e) {
- return null;
- }
- }
- public static Ability getNewAbilityHostile()
- {
- try {
- return (Ability)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("getNewAbilityHostile").invoke(null);
- } catch (Exception e) {
- return null;
- }
- }
- public static Ability getNewAbilitySunburn()
- {
- try {
- return (Ability)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("getNewAbilitySunburn").invoke(null);
- } catch (Exception e) {
- return null;
- }
- }
- public static Ability getNewAbilitySwim(boolean canBreatheOnLand)
- {
- try {
- return (Ability)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("getNewAbilitySwim", boolean.class).invoke(null, canBreatheOnLand);
- } catch (Exception e) {
- return null;
- }
- }
- public static Ability getNewAbilityWaterAllergy()
- {
- try {
- return (Ability)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("getNewAbilityWaterAllergy").invoke(null);
- } catch (Exception e) {
- return null;
- }
- }
-
+ public static Ability createNewAbilityByType(String type, String[] arguments)
+ {
+ try {
+ return (Ability)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("createNewAbilityByType", String.class, String[].class).invoke(null, type, arguments);
+ } catch (Exception e) {
+ return null;
+ }
+ }
}
diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java b/src/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java
new file mode 100644
index 00000000..8eff88d4
--- /dev/null
+++ b/src/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java
@@ -0,0 +1,113 @@
+package powercrystals.minefactoryreloaded.api;
+
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+
+/**
+ * @author PowerCrystals
+ *
+ * Class used to register plants and other farming-related things with MFR. Will do nothing if MFR does not exist.
+ *
+ */
+public class FactoryRegistry
+{
+ /*
+ * This may be called at any time during pre-init, init or post-init, assuming all blocks and items
+ * that are being accessed from the registry have been appropriately registered.
+ * Possible messages:
+ *
+ * // Registration:
+ * addLaserPreferredOre | NBTTag with an ItemStack saved on it, with the color on the "value" attribute,
+ * | A ValuedItem with item and value set.
+ * registerAutoSpawnerBlacklist | The String identifier of an entity,
+ * | A subclass of EntityLivingBase.
+ * registerFertilizable | An instance of IFactoryFertilizable.
+ * registerFertilizer | An instance of IFactoryFertilizer.
+ * registerFruitLog | The String identifier of a block.
+ * registerGrindable | An instance of IFactoryGrindable.
+ * registerGrinderBlacklist | A subclass of EntityLivingBase.
+ * registerHarvestable | An instance of IFactoryHarvestable.
+ * registerLaserOre | NBTTag with an ItemStack saved on it, with the weight on the "value" attribute,
+ * | A ValuedItem with item and value set.
+ * registerLiquidDrinkHandler | A ValuedItem with key and object set; ILiquidDrinkHandler expected.
+ * registerMobEggHandler | An instance of IMobEggHandler.
+ * registerPickableFruit | An instance of IFactoryFruit.
+ * registerPlantable | An instance of IFactoryPlantable.
+ * registerRanchable | An instance of IFactoryRanchable.
+ * registerRedNetLogicCircuit | An instance of IRedNetLogicCircuit.
+ * registerRubberTreeBiome | The biomeName field of a biome to white list for rubber trees to spawn in.
+ * registerSafariNetBlacklist | A subclass of EntityLivingBase.
+ * registerSafariNetHandler | An instance of ISafariNetHandler.
+ * registerSludgeDrop | NBTTag with an ItemStack saved on it, with the weight on the "value" attribute,
+ * | A ValuedItem with item and value set.
+ * registerSpawnHandler | An instance of IMobSpawnHandler.
+ * registerVillagerTradeMob | An instance of IRandomMobProvider.
+ *
+ * // Simple implementations:
+ * { Harvestables
+ * registerHarvestable_Standard | The String identifier of a block.
+ * registerHarvestable_Log | The String identifier of a block.
+ * registerHarvestable_Leaves | The String identifier of a block.
+ * registerHarvestable_Vine | The String identifier of a block.
+ * registerHarvestable_Shrub | The String identifier of a block.
+ * registerHarvestable_Mushroom | The String identifier of a block.
+ * registerHarvestable_Crop | An ItemStack of a block, with a damage value indicating the meta value to harvest at.
+ * | A ValuedItem with value and object set; Block expected.
+ * registerHarvestable_Gourd | An NBTTag with the stem and fruit attributes, both String identifiers of blocks.
+ * }
+ * { Plantables
+ * registerPlantable_Standard | An NBTTag with the seed (Item, String identifier), and
+ * crop (Block, String identifier) attributes set, optionally
+ * also having the meta (Integer, placed metadata value) attribute set.
+ * No special checks for location, just sustainability.
+ * registerPlantable_Crop | An NBTTag with the seed (Item, String identifier), and
+ * crop (Block, String identifier) attributes set, optionally
+ * also having the meta (Integer, placed metadata value) attribute set.
+ * Will automatically hoe dirt and grass into farmland when planting.
+ * registerPlantable_Sapling | An NBTTag with the sapling (Block, String identifier), and optionally
+ * the seed (Item, String identifier) attributes set.
+ * }
+ * { Fertilizer
+ * registerFertilizer | An NBTTag with the fert (Item, String identifier), meta (Integer), and
+ * type (Integer, index into FertilizerType.values()) attributes set.
+ * }
+ * { Fertilizables
+ * registerFertilizable_Grass | The String identifier of a block. Will bonemeal the block and expect
+ * tall grass be planted above and around it, must be IGrowable. Works with
+ * the GrowPlant and Grass type fertilizers, not recommended for crop plants.
+ * registerFertilizable_Gourd | The String identifier of a block. Must be IGrowable, and expects identical
+ * behavior to vanilla stems. Works with the GrowPlant fertilizers.
+ * registerFertilizable_Crop | An NBTTag with the plant (Block, String identifier, IGrowable), and
+ * meta (Integer, max growth phase) attributes set, optionally also having
+ * the type (Integer, index into FertilizerType) attribute set.
+ * registerFertilizable_Cocoa | An NBTTag with the plant (Block, String identifier), and optionally also
+ * the type (Integer, index into FertilizerType) attributes set.
+ * Expects metadata of the block to exactly match cocoa pods.
+ * registerFertilizable_Standard | An NBTTag with the plant (Block, String identifier, IGrowable), and
+ * optionally also the type (Integer, index into FertilizerType) attributes set.
+ * Expects the block to change when successfully grown (e.g., saplings).
+ * }
+ */
+ public static void sendMessage(String message, Object value)
+ {
+ if (!Loader.isModLoaded("MineFactoryReloaded") ||
+ Loader.instance().activeModContainer() == null)
+ return;
+ try
+ {
+ Method m = FMLInterModComms.class.getDeclaredMethod("enqueueMessage", Object.class, String.class, IMCMessage.class);
+ m.setAccessible(true);
+ Constructor c = IMCMessage.class.getDeclaredConstructor(String.class, Object.class);
+ c.setAccessible(true);
+ m.invoke(null, Loader.instance().activeModContainer(), "MineFactoryReloaded", c.newInstance(message, value));
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java b/src/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java
new file mode 100644
index 00000000..a56208ee
--- /dev/null
+++ b/src/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java
@@ -0,0 +1,44 @@
+package powercrystals.minefactoryreloaded.api;
+
+/**
+ * @author PowerCrystals
+ *
+ * Determines what algorithm the Harvester uses when it encounters this IFactoryHarvestable in the world.
+ */
+public enum HarvestType
+{
+ /**
+ * Just break the single block - no special action needed. e.g. Carrots, flowers, wheat.
+ */
+ Normal,
+ /**
+ * Search for harvestable blocks adjacent to this block but leave this block. e.g. Pumpkin, melon
+ */
+ Gourd,
+ /**
+ * Search for identical blocks above.
+ */
+ Column,
+ /**
+ * Search for identical blocks above but leave the bottom one for the future. e.g. Cactus, sugarcane.
+ */
+ LeaveBottom,
+ /**
+ * This block is the base of a tree and the harvester should enter tree-cutting mode.
+ */
+ Tree,
+ /**
+ * This block is the base of the tree and the harvester should enter tree-cutting mode.
+ * The tree is searched for in the negative y axis instead.
+ */
+ TreeFlipped,
+ /**
+ * This block is part of a tree as above.
+ */
+ TreeLeaf,
+ /**
+ * This block is part of a tree as above, but fruits are cut before logs. e.g. cocoa
+ * The tree is not searched for.
+ */
+ TreeFruit
+}
diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java
new file mode 100644
index 00000000..edfb8c99
--- /dev/null
+++ b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java
@@ -0,0 +1,35 @@
+package powercrystals.minefactoryreloaded.api;
+
+import java.util.List;
+import java.util.Random;
+
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.world.World;
+
+/**
+ * @author PowerCrystals
+ *
+ * Defines a grindable entity for the Grinder.
+ */
+public interface IFactoryGrindable
+{
+ /**
+ * @return The class that this grindable instance is handling. This must be a subtype of EntityLivingBase or the entity will never
+ * be noticed by the Grinder.
+ */
+ public Class extends EntityLivingBase> getGrindableEntity();
+
+ /**
+ * @param world The world this entity is in.
+ * @param entity The entity instance being ground.
+ * @param random A Random instance.
+ * @return The drops generated when this entity is killed.
+ */
+ public List grind(World world, EntityLivingBase entity, Random random);
+
+ /**
+ * @param entity The entity instance being ground.
+ * @return Whether this entity has been fully processed or not.
+ */
+ public boolean processEntity(EntityLivingBase entity);
+}
diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java
new file mode 100644
index 00000000..d4e620a8
--- /dev/null
+++ b/src/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java
@@ -0,0 +1,71 @@
+package powercrystals.minefactoryreloaded.api;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+/**
+ * @author PowerCrystals
+ *
+ * Defines a harvestable block for the Harvester.
+ */
+public interface IFactoryHarvestable
+{
+ /**
+ * @return The block this harvestable instance is managing.
+ */
+ public Block getPlant();
+
+ /**
+ * @return The type of harvest the Harvester should perform on this block.
+ */
+ public HarvestType getHarvestType();
+
+ /**
+ * @return Whether or not the Harvester should break the block when harvesting. If false, no changes will be performed by the Harvester itself.
+ */
+ public boolean breakBlock();
+
+ /**
+ * @param world The world this block is in.
+ * @param harvesterSettings The harvester's current settings. Do not modify these.
+ * @param x The X coordinate of the block being harvested.
+ * @param y The Y coordinate of the block being harvested.
+ * @param z The Z coordinate of the block being harvested.
+ * @return True if this block can be harvested.
+ */
+ public boolean canBeHarvested(World world, Map harvesterSettings, int x, int y, int z);
+
+ /**
+ * @param world The world this block is in.
+ * @param rand A Random instance to use when generating drops.
+ * @param harvesterSettings The harvester's current settings. Do not modify these.
+ * @param x The X coordinate of the block being harvested.
+ * @param y The Y coordinate of the block being harvested.
+ * @param z The Z coordinate of the block being harvested.
+ * @return The drops generated by breaking this block. For a default implementation, calling Block.getBlockDropped() is usually sufficient.
+ */
+ public List getDrops(World world, Random rand, Map harvesterSettings, int x, int y, int z);
+
+ /**
+ * Called before the block is going to be harvested. Usually empty.
+ * @param world The world this block is in.
+ * @param x The X coordinate of the block being harvested.
+ * @param y The Y coordinate of the block being harvested.
+ * @param z The Z coordinate of the block being harvested.
+ */
+ public void preHarvest(World world, int x, int y, int z);
+
+ /**
+ * Called after the block is going to be harvested. Used to re-till soil, for example.
+ * @param world The world this block is in.
+ * @param x The X coordinate of the block being harvested.
+ * @param y The Y coordinate of the block being harvested.
+ * @param z The Z coordinate of the block being harvested.
+ */
+ public void postHarvest(World world, int x, int y, int z);
+}
diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java b/src/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java
new file mode 100644
index 00000000..31eba004
--- /dev/null
+++ b/src/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java
@@ -0,0 +1,8 @@
+package powercrystals.minefactoryreloaded.api;
+
+import net.minecraft.entity.EntityLivingBase;
+
+public interface ILiquidDrinkHandler
+{
+ public void onDrink(EntityLivingBase player);
+}
diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java b/src/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java
new file mode 100644
index 00000000..7f5dd7cc
--- /dev/null
+++ b/src/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java
@@ -0,0 +1,21 @@
+package powercrystals.minefactoryreloaded.api;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.WeightedRandom;
+
+public class MobDrop extends WeightedRandom.Item
+{
+ private ItemStack _stack;
+
+ public MobDrop(int weight, ItemStack stack)
+ {
+ super(weight);
+ _stack = stack;
+ }
+
+ public ItemStack getStack()
+ {
+ if(_stack == null) return null;
+ return _stack.copy();
+ }
+}
diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java b/src/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java
new file mode 100644
index 00000000..3d075fa3
--- /dev/null
+++ b/src/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java
@@ -0,0 +1,72 @@
+package powercrystals.minefactoryreloaded.api;
+
+import net.minecraft.item.ItemStack;
+
+public class ValuedItem
+{
+ public final int value;
+ public final ItemStack item;
+ public final String key;
+ public final Object object;
+
+ public ValuedItem(int v, ItemStack i)
+ {
+ value = v;
+ item = i;
+ key = null;
+ object = null;
+ }
+
+ public ValuedItem(String v, Object i)
+ {
+ value = -1;
+ item = null;
+ key = v;
+ object = i;
+ }
+
+ /**
+ * Presently unused but included so that if they do get used in the future,
+ * people including this in their jar and loading before MFR don't destroy everyone
+ */
+
+ public ValuedItem(int v, Object i)
+ {
+ value = v;
+ item = null;
+ key = null;
+ object = i;
+ }
+
+ public ValuedItem(String v, ItemStack i)
+ {
+ value = -1;
+ item = i;
+ key = v;
+ object = null;
+ }
+
+ public ValuedItem(int v, String k, ItemStack i)
+ {
+ value = v;
+ item = i;
+ key = k;
+ object = null;
+ }
+
+ public ValuedItem(int v, String k, Object i)
+ {
+ value = v;
+ item = null;
+ key = k;
+ object = i;
+ }
+
+ public ValuedItem(int v, String k, ItemStack i, Object o)
+ {
+ value = v;
+ item = i;
+ key = k;
+ object = o;
+ }
+}
diff --git a/src/main/java/tconstruct/TConstruct.java b/src/main/java/tconstruct/TConstruct.java
index 4f43e02c..0a314032 100644
--- a/src/main/java/tconstruct/TConstruct.java
+++ b/src/main/java/tconstruct/TConstruct.java
@@ -3,40 +3,12 @@ package tconstruct;
import java.util.Map;
import java.util.Random;
-import mantle.pulsar.config.ForgeCFG;
-import mantle.pulsar.control.PulseManager;
-import net.minecraft.world.gen.structure.MapGenStructureIO;
-import net.minecraftforge.common.MinecraftForge;
-
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import tconstruct.armor.TinkerArmor;
-import tconstruct.armor.player.TPlayerHandler;
-import tconstruct.client.TControls;
-import tconstruct.common.TConstructCreativeTab;
-import tconstruct.common.TProxyCommon;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.crafting.Detailing;
-import tconstruct.library.crafting.LiquidCasting;
-import tconstruct.mechworks.TinkerMechworks;
-import tconstruct.mechworks.landmine.behavior.Behavior;
-import tconstruct.mechworks.landmine.behavior.stackCombo.SpecialStackHandler;
-import tconstruct.plugins.imc.TinkerThaumcraft;
-import tconstruct.plugins.nei.TinkerNEI;
-import tconstruct.smeltery.TinkerSmeltery;
-import tconstruct.tools.TinkerTools;
-import tconstruct.util.EnvironmentChecks;
-import tconstruct.util.config.DimensionBlacklist;
-import tconstruct.util.config.PHConstruct;
-import tconstruct.util.network.PacketPipeline;
-import tconstruct.world.TinkerWorld;
-import tconstruct.world.gen.SlimeIslandGen;
-import tconstruct.world.village.ComponentSmeltery;
-import tconstruct.world.village.ComponentToolWorkshop;
-import tconstruct.world.village.TVillageTrades;
-import tconstruct.world.village.VillageSmelteryHandler;
-import tconstruct.world.village.VillageToolStationHandler;
+import net.minecraft.world.gen.structure.MapGenStructureIO;
+import net.minecraftforge.common.MinecraftForge;
+
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
@@ -51,6 +23,37 @@ import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.VillagerRegistry;
import cpw.mods.fml.relauncher.Side;
+import mantle.pulsar.config.ForgeCFG;
+import mantle.pulsar.control.PulseManager;
+import tconstruct.armor.TinkerArmor;
+import tconstruct.armor.player.TPlayerHandler;
+import tconstruct.client.TControls;
+import tconstruct.common.TConstructCreativeTab;
+import tconstruct.common.TProxyCommon;
+import tconstruct.library.TConstructRegistry;
+import tconstruct.library.crafting.Detailing;
+import tconstruct.library.crafting.LiquidCasting;
+import tconstruct.mechworks.TinkerMechworks;
+import tconstruct.mechworks.landmine.behavior.Behavior;
+import tconstruct.mechworks.landmine.behavior.stackCombo.SpecialStackHandler;
+import tconstruct.plugins.ic2.TinkerIC2;
+import tconstruct.plugins.imc.TinkerAE2;
+import tconstruct.plugins.imc.TinkerBuildCraft;
+import tconstruct.plugins.imc.TinkerMystcraft;
+import tconstruct.plugins.imc.TinkerThaumcraft;
+import tconstruct.plugins.mfr.TinkerMFR;
+import tconstruct.plugins.nei.TinkerNEI;
+import tconstruct.plugins.te4.TinkerTE4;
+import tconstruct.plugins.waila.TinkerWaila;
+import tconstruct.smeltery.TinkerSmeltery;
+import tconstruct.tools.TinkerTools;
+import tconstruct.util.EnvironmentChecks;
+import tconstruct.util.config.DimensionBlacklist;
+import tconstruct.util.config.PHConstruct;
+import tconstruct.util.network.PacketPipeline;
+import tconstruct.world.TinkerWorld;
+import tconstruct.world.gen.SlimeIslandGen;
+import tconstruct.world.village.*;
/**
* TConstruct, the tool mod. Craft your tools with style, then modify until the
@@ -121,6 +124,13 @@ public class TConstruct
pulsar.registerPulse(new TinkerArmor());
pulsar.registerPulse(new TinkerNEI());
pulsar.registerPulse(new TinkerThaumcraft());
+ pulsar.registerPulse(new TinkerWaila());
+ pulsar.registerPulse(new TinkerBuildCraft());
+ pulsar.registerPulse(new TinkerAE2());
+ pulsar.registerPulse(new TinkerIC2());
+ pulsar.registerPulse(new TinkerMystcraft());
+ pulsar.registerPulse(new TinkerMFR());
+ pulsar.registerPulse(new TinkerTE4());
/*pulsar.registerPulse(new TinkerPrayers());
pulsar.registerPulse(new TinkerCropify());*/
diff --git a/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java b/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java
index 22fcab05..4cbcac8f 100644
--- a/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java
+++ b/src/main/java/tconstruct/armor/ArmorAbilitiesClient.java
@@ -4,7 +4,6 @@ import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
-import tconstruct.armor.items.TravelGear;
import tconstruct.armor.player.TPlayerStats;
import tconstruct.client.TControls;
import tconstruct.library.modifier.IModifyable;
diff --git a/src/main/java/tconstruct/armor/ArmorProxyClient.java b/src/main/java/tconstruct/armor/ArmorProxyClient.java
index b411c800..6a47abaf 100644
--- a/src/main/java/tconstruct/armor/ArmorProxyClient.java
+++ b/src/main/java/tconstruct/armor/ArmorProxyClient.java
@@ -48,7 +48,6 @@ import tconstruct.client.tabs.TabRegistry;
import tconstruct.common.TProxyCommon;
import tconstruct.library.accessory.IAccessoryModel;
import tconstruct.library.client.TConstructClientRegistry;
-import tconstruct.tools.TinkerTools;
import tconstruct.world.TinkerWorld;
import com.google.common.collect.Lists;
diff --git a/src/main/java/tconstruct/armor/ArmorTickHandler.java b/src/main/java/tconstruct/armor/ArmorTickHandler.java
index b3362046..1486e044 100644
--- a/src/main/java/tconstruct/armor/ArmorTickHandler.java
+++ b/src/main/java/tconstruct/armor/ArmorTickHandler.java
@@ -1,9 +1,7 @@
package tconstruct.armor;
import net.minecraft.client.Minecraft;
-import net.minecraft.init.Blocks;
import tconstruct.client.TControls;
-import tconstruct.world.TinkerWorld;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tconstruct/armor/TinkerArmor.java b/src/main/java/tconstruct/armor/TinkerArmor.java
index b589f59a..ec4af0e8 100644
--- a/src/main/java/tconstruct/armor/TinkerArmor.java
+++ b/src/main/java/tconstruct/armor/TinkerArmor.java
@@ -33,7 +33,6 @@ import tconstruct.library.armor.ArmorPart;
import tconstruct.library.crafting.DryingRackRecipes;
import tconstruct.library.crafting.LiquidCasting;
import tconstruct.library.crafting.ModifyBuilder;
-import tconstruct.modifiers.accessory.GloveClimb;
import tconstruct.modifiers.accessory.GloveSpeed;
import tconstruct.modifiers.armor.AModBoolean;
import tconstruct.modifiers.armor.AModInteger;
diff --git a/src/main/java/tconstruct/armor/TinkerArmorEvents.java b/src/main/java/tconstruct/armor/TinkerArmorEvents.java
index 67579dfc..d6caf96d 100644
--- a/src/main/java/tconstruct/armor/TinkerArmorEvents.java
+++ b/src/main/java/tconstruct/armor/TinkerArmorEvents.java
@@ -4,7 +4,6 @@ import net.minecraft.entity.boss.EntityDragon;
import net.minecraft.entity.boss.IBossDisplayData;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.monster.IMob;
-import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
@@ -15,10 +14,7 @@ import tconstruct.armor.items.TravelWings;
import tconstruct.armor.player.TPlayerStats;
import tconstruct.library.modifier.IModifyable;
import tconstruct.world.entity.BlueSlime;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
public class TinkerArmorEvents
{
diff --git a/src/main/java/tconstruct/armor/gui/KnapsackGui.java b/src/main/java/tconstruct/armor/gui/KnapsackGui.java
index c0553fd8..66d0a4b7 100644
--- a/src/main/java/tconstruct/armor/gui/KnapsackGui.java
+++ b/src/main/java/tconstruct/armor/gui/KnapsackGui.java
@@ -1,6 +1,5 @@
package tconstruct.armor.gui;
-import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.InventoryEffectRenderer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;
diff --git a/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java b/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java
index 135423fa..142201a2 100644
--- a/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java
+++ b/src/main/java/tconstruct/armor/model/HiddenPlayerModel.java
@@ -1,8 +1,6 @@
package tconstruct.armor.model;
import net.minecraft.client.model.ModelBiped;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.entity.Entity;
public class HiddenPlayerModel extends ModelBiped
{
diff --git a/src/main/java/tconstruct/armor/player/TPlayerHandler.java b/src/main/java/tconstruct/armor/player/TPlayerHandler.java
index e5d02283..0517fd87 100644
--- a/src/main/java/tconstruct/armor/player/TPlayerHandler.java
+++ b/src/main/java/tconstruct/armor/player/TPlayerHandler.java
@@ -10,7 +10,6 @@ import java.util.HashSet;
import java.util.Random;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
import mantle.player.PlayerUtils;
import net.minecraft.enchantment.Enchantment;
@@ -18,7 +17,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.Entity.EnumEntitySize;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
diff --git a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java
index f1eba470..4288f5bc 100644
--- a/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java
+++ b/src/main/java/tconstruct/blocks/slime/SlimeLeaves.java
@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Random;
import net.minecraft.block.BlockLeaves;
+import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
@@ -73,7 +74,7 @@ public class SlimeLeaves extends BlockLeaves
public IIcon getIcon (int side, int meta)
{
int tex = meta % 4;
-
+ this.setGraphicsLevel(Minecraft.getMinecraft().gameSettings.fancyGraphics);
if (this.field_150121_P)
return fancyIcons[tex];
else
diff --git a/src/main/java/tconstruct/client/TProxyClient.java b/src/main/java/tconstruct/client/TProxyClient.java
index 8739dbf9..d1a45682 100644
--- a/src/main/java/tconstruct/client/TProxyClient.java
+++ b/src/main/java/tconstruct/client/TProxyClient.java
@@ -1,158 +1,27 @@
package tconstruct.client;
import java.io.InputStream;
-import java.util.ArrayList;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import mantle.client.MProxyClient;
import mantle.client.SmallFontRenderer;
import mantle.lib.client.MantleClientRegistry;
-import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiInventory;
-import net.minecraft.client.model.ModelSlime;
-import net.minecraft.client.particle.EntityAuraFX;
-import net.minecraft.client.particle.EntityBreakingFX;
-import net.minecraft.client.particle.EntityBubbleFX;
-import net.minecraft.client.particle.EntityCloudFX;
-import net.minecraft.client.particle.EntityCritFX;
-import net.minecraft.client.particle.EntityDropParticleFX;
-import net.minecraft.client.particle.EntityEnchantmentTableParticleFX;
-import net.minecraft.client.particle.EntityExplodeFX;
-import net.minecraft.client.particle.EntityFX;
-import net.minecraft.client.particle.EntityFireworkSparkFX;
-import net.minecraft.client.particle.EntityFlameFX;
-import net.minecraft.client.particle.EntityFootStepFX;
-import net.minecraft.client.particle.EntityHeartFX;
-import net.minecraft.client.particle.EntityHugeExplodeFX;
-import net.minecraft.client.particle.EntityLargeExplodeFX;
-import net.minecraft.client.particle.EntityLavaFX;
-import net.minecraft.client.particle.EntityNoteFX;
-import net.minecraft.client.particle.EntityPortalFX;
-import net.minecraft.client.particle.EntityReddustFX;
-import net.minecraft.client.particle.EntitySmokeFX;
-import net.minecraft.client.particle.EntitySnowShovelFX;
-import net.minecraft.client.particle.EntitySpellParticleFX;
-import net.minecraft.client.particle.EntitySplashFX;
-import net.minecraft.client.particle.EntitySuspendFX;
import net.minecraft.client.renderer.entity.RenderItem;
-import net.minecraft.client.renderer.entity.RenderSnowball;
-import net.minecraft.client.settings.GameSettings;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.World;
-import net.minecraftforge.client.MinecraftForgeClient;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fluids.RenderBlockFluid;
import org.w3c.dom.Document;
import tconstruct.TConstruct;
import tconstruct.armor.ArmorProxyClient;
-import tconstruct.armor.TinkerArmor;
-import tconstruct.armor.ArmorProxyCommon;
-import tconstruct.armor.gui.ArmorExtendedGui;
-import tconstruct.armor.gui.KnapsackGui;
-import tconstruct.armor.modelblock.DryingRackRender;
-import tconstruct.armor.modelblock.DryingRackSpecialRender;
import tconstruct.armor.player.TPlayerStats;
-import tconstruct.blocks.logic.DryingRackLogic;
-import tconstruct.client.entity.item.ExplosiveRender;
-import tconstruct.client.entity.projectile.ArrowRenderCustom;
-import tconstruct.client.entity.projectile.DaggerRenderCustom;
-import tconstruct.client.entity.projectile.LaunchedItemRender;
-import tconstruct.client.pages.BlockCastPage;
-import tconstruct.client.pages.MaterialPage;
-import tconstruct.client.pages.ModifierPage;
-import tconstruct.client.pages.ToolPage;
-import tconstruct.client.tabs.InventoryTabArmorExtended;
-import tconstruct.client.tabs.InventoryTabKnapsack;
-import tconstruct.client.tabs.InventoryTabVanilla;
-import tconstruct.client.tabs.TabRegistry;
import tconstruct.common.TProxyCommon;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.library.client.TConstructClientRegistry;
-import tconstruct.library.client.ToolGuiElement;
-import tconstruct.library.crafting.ToolBuilder;
-import tconstruct.library.tools.ToolCore;
-import tconstruct.mechworks.MechworksProxyCommon;
-import tconstruct.mechworks.entity.item.EntityLandmineFirework;
-import tconstruct.mechworks.entity.item.ExplosivePrimed;
-import tconstruct.mechworks.gui.GuiLandmine;
-import tconstruct.mechworks.inventory.ContainerLandmine;
-import tconstruct.mechworks.logic.TileEntityLandmine;
-import tconstruct.mechworks.model.CartRender;
-import tconstruct.smeltery.SmelteryProxyCommon;
-import tconstruct.smeltery.TinkerSmeltery;
-import tconstruct.smeltery.gui.AdaptiveSmelteryGui;
-import tconstruct.smeltery.gui.SmelteryGui;
-import tconstruct.smeltery.logic.AdaptiveSmelteryLogic;
-import tconstruct.smeltery.logic.CastingBasinLogic;
-import tconstruct.smeltery.logic.CastingTableLogic;
-import tconstruct.smeltery.logic.SmelteryLogic;
-import tconstruct.smeltery.model.BlockRenderCastingChannel;
-import tconstruct.smeltery.model.CastingBasinSpecialRender;
-import tconstruct.smeltery.model.CastingTableSpecialRenderer;
-import tconstruct.smeltery.model.PaneConnectedRender;
-import tconstruct.smeltery.model.PaneRender;
-import tconstruct.smeltery.model.CastingBlockRender;
-import tconstruct.smeltery.model.SmelteryRender;
-import tconstruct.smeltery.model.TankAirRender;
-import tconstruct.smeltery.model.TankRender;
-import tconstruct.tools.TinkerTools;
-import tconstruct.tools.ToolProxyCommon;
-import tconstruct.tools.entity.ArrowEntity;
-import tconstruct.tools.entity.DaggerEntity;
-import tconstruct.tools.entity.FancyEntityItem;
-import tconstruct.tools.entity.LaunchedPotion;
-import tconstruct.tools.gui.CraftingStationGui;
-import tconstruct.tools.gui.FrypanGui;
-import tconstruct.tools.gui.FurnaceGui;
-import tconstruct.tools.gui.PartCrafterGui;
-import tconstruct.tools.gui.PatternChestGui;
-import tconstruct.tools.gui.StencilTableGui;
-import tconstruct.tools.gui.ToolForgeGui;
-import tconstruct.tools.gui.ToolStationGui;
import tconstruct.tools.items.ManualInfo;
-import tconstruct.tools.logic.CraftingStationLogic;
-import tconstruct.tools.logic.FrypanLogic;
-import tconstruct.tools.logic.FurnaceLogic;
-import tconstruct.tools.logic.PartBuilderLogic;
-import tconstruct.tools.logic.PatternChestLogic;
-import tconstruct.tools.logic.StencilTableLogic;
-import tconstruct.tools.logic.ToolForgeLogic;
-import tconstruct.tools.logic.ToolStationLogic;
-import tconstruct.tools.model.FancyItemRender;
-import tconstruct.tools.model.FrypanRender;
-import tconstruct.tools.model.TableRender;
-import tconstruct.tools.model.TableRender;
-import tconstruct.util.config.PHConstruct;
-
-import com.google.common.collect.Lists;
-
-import cpw.mods.fml.client.registry.ClientRegistry;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.registry.VillagerRegistry;
-import tconstruct.world.TinkerWorld;
-import tconstruct.world.entity.BlueSlime;
-import tconstruct.world.entity.CartEntity;
-import tconstruct.world.entity.Crystal;
-import tconstruct.world.model.BarricadeRender;
-import tconstruct.world.model.CrystalRender;
-import tconstruct.world.model.OreberryRender;
-import tconstruct.world.model.PunjiRender;
-import tconstruct.world.model.RenderLandmine;
-import tconstruct.world.model.SlimeChannelRender;
-import tconstruct.world.model.SlimePadRender;
-import tconstruct.world.model.SlimeRender;
public class TProxyClient extends TProxyCommon
{
diff --git a/src/main/java/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java
index 6ee743e1..f7bd7426 100644
--- a/src/main/java/tconstruct/items/tools/Battleaxe.java
+++ b/src/main/java/tconstruct/items/tools/Battleaxe.java
@@ -4,7 +4,6 @@ import mantle.world.WorldHelper;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/tconstruct/items/tools/Cleaver.java b/src/main/java/tconstruct/items/tools/Cleaver.java
index b1e23563..f4cd9916 100644
--- a/src/main/java/tconstruct/items/tools/Cleaver.java
+++ b/src/main/java/tconstruct/items/tools/Cleaver.java
@@ -10,7 +10,6 @@ import net.minecraft.world.World;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.Weapon;
import tconstruct.tools.TinkerTools;
-import tconstruct.util.config.PHConstruct;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java
index d4349037..6f531e92 100644
--- a/src/main/java/tconstruct/items/tools/Excavator.java
+++ b/src/main/java/tconstruct/items/tools/Excavator.java
@@ -3,7 +3,6 @@ package tconstruct.items.tools;
import mantle.world.WorldHelper;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
-import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java
index ab644e03..2bb0f523 100644
--- a/src/main/java/tconstruct/items/tools/Hammer.java
+++ b/src/main/java/tconstruct/items/tools/Hammer.java
@@ -6,7 +6,6 @@ import mantle.world.WorldHelper;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
diff --git a/src/main/java/tconstruct/items/tools/Hatchet.java b/src/main/java/tconstruct/items/tools/Hatchet.java
index 056b80f1..14b6d847 100644
--- a/src/main/java/tconstruct/items/tools/Hatchet.java
+++ b/src/main/java/tconstruct/items/tools/Hatchet.java
@@ -9,7 +9,6 @@ import net.minecraft.world.World;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.HarvestTool;
import tconstruct.tools.TinkerTools;
-import tconstruct.util.config.PHConstruct;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -42,10 +41,7 @@ public class Hatchet extends HarvestTool
return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random);
}
- static Material[] materials = { Material.wood, Material.leaves, Material.vine, Material.circuits, Material.cactus };// TODO find
- // this//,
- // Material.pumpkin
- // };
+ static Material[] materials = { Material.wood, Material.leaves, Material.vine, Material.circuits, Material.cactus, Material.gourd };
@Override
public Item getHeadItem ()
diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java
index 949fe621..69ebb503 100644
--- a/src/main/java/tconstruct/items/tools/LumberAxe.java
+++ b/src/main/java/tconstruct/items/tools/LumberAxe.java
@@ -3,7 +3,6 @@ package tconstruct.items.tools;
import mantle.world.WorldHelper;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
-import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -65,8 +64,7 @@ public class LumberAxe extends HarvestTool
return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random);
}
- static Material[] materials = { Material.wood, Material.vine, Material.circuits, Material.cactus };// TODO find this//,
- // Material.pumpkin };
+ static Material[] materials = { Material.wood, Material.vine, Material.circuits, Material.cactus, Material.gourd };
/* Lumber axe specific */
diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java
index a8e5271b..3756b29b 100644
--- a/src/main/java/tconstruct/items/tools/Scythe.java
+++ b/src/main/java/tconstruct/items/tools/Scythe.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
-import mantle.world.WorldHelper;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.enchantment.Enchantment;
@@ -45,9 +44,7 @@ public class Scythe extends Weapon
return materials;
}
- static Material[] materials = new Material[] { Material.web, Material.cactus, Material.plants, Material.leaves, Material.vine };// TODO find this//, Material.pumpkin,
- // Material.plants, Material.vine,
- // Material.leaves };
+ static Material[] materials = new Material[] { Material.web, Material.cactus, Material.plants, Material.leaves, Material.vine, Material.gourd };
@Override
public Item getHeadItem ()
diff --git a/src/main/java/tconstruct/library/accessory/IAccessory.java b/src/main/java/tconstruct/library/accessory/IAccessory.java
index fa45bf4e..0a59c726 100644
--- a/src/main/java/tconstruct/library/accessory/IAccessory.java
+++ b/src/main/java/tconstruct/library/accessory/IAccessory.java
@@ -1,10 +1,6 @@
package tconstruct.library.accessory;
-import net.minecraft.entity.Entity;
import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
public interface IAccessory
{
diff --git a/src/main/java/tconstruct/library/armor/ArmorMod.java b/src/main/java/tconstruct/library/armor/ArmorMod.java
index b5fc0988..b60bdca6 100644
--- a/src/main/java/tconstruct/library/armor/ArmorMod.java
+++ b/src/main/java/tconstruct/library/armor/ArmorMod.java
@@ -1,7 +1,6 @@
package tconstruct.library.armor;
import java.util.EnumSet;
-import java.util.UUID;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
diff --git a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java
index 8c0ac96d..35762d31 100644
--- a/src/main/java/tconstruct/library/client/TConstructClientRegistry.java
+++ b/src/main/java/tconstruct/library/client/TConstructClientRegistry.java
@@ -9,7 +9,6 @@ import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.ModifyBuilder;
-import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.tools.ToolCore;
public class TConstructClientRegistry
diff --git a/src/main/java/tconstruct/library/crafting/ModifyBuilder.java b/src/main/java/tconstruct/library/crafting/ModifyBuilder.java
index eb26e6c4..83071fb0 100644
--- a/src/main/java/tconstruct/library/crafting/ModifyBuilder.java
+++ b/src/main/java/tconstruct/library/crafting/ModifyBuilder.java
@@ -3,11 +3,8 @@ package tconstruct.library.crafting;
import java.util.ArrayList;
import java.util.List;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import tconstruct.library.armor.ArmorMod;
import tconstruct.library.modifier.IModifyable;
import tconstruct.library.modifier.ItemModifier;
diff --git a/src/main/java/tconstruct/library/tools/DualHarvestTool.java b/src/main/java/tconstruct/library/tools/DualHarvestTool.java
index 9fe792ca..5fdd3d10 100644
--- a/src/main/java/tconstruct/library/tools/DualHarvestTool.java
+++ b/src/main/java/tconstruct/library/tools/DualHarvestTool.java
@@ -3,7 +3,6 @@ package tconstruct.library.tools;
import mantle.world.WorldHelper;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
-import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java
index 0ef85a56..0a8c9c81 100644
--- a/src/main/java/tconstruct/library/tools/ToolCore.java
+++ b/src/main/java/tconstruct/library/tools/ToolCore.java
@@ -13,18 +13,17 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemPotion;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import tconstruct.library.ActiveToolMod;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.ToolBuilder;
import tconstruct.library.modifier.IModifyable;
+import tconstruct.library.modifier.ItemModifier;
import tconstruct.tools.entity.FancyEntityItem;
import cofh.api.energy.IEnergyContainerItem;
import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tconstruct/mechworks/MechworksProxyClient.java b/src/main/java/tconstruct/mechworks/MechworksProxyClient.java
index 8c7d242b..4a1e7b9f 100644
--- a/src/main/java/tconstruct/mechworks/MechworksProxyClient.java
+++ b/src/main/java/tconstruct/mechworks/MechworksProxyClient.java
@@ -1,47 +1,17 @@
package tconstruct.mechworks;
-import cpw.mods.fml.client.registry.RenderingRegistry;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiInventory;
import net.minecraft.client.renderer.entity.RenderSnowball;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.world.World;
-import tconstruct.armor.ArmorProxyCommon;
-import tconstruct.armor.gui.ArmorExtendedGui;
-import tconstruct.armor.gui.KnapsackGui;
-import tconstruct.client.TProxyClient;
import tconstruct.client.entity.item.ExplosiveRender;
-import tconstruct.client.tabs.TabRegistry;
import tconstruct.common.TProxyCommon;
import tconstruct.mechworks.entity.item.EntityLandmineFirework;
import tconstruct.mechworks.entity.item.ExplosivePrimed;
import tconstruct.mechworks.gui.GuiLandmine;
import tconstruct.mechworks.inventory.ContainerLandmine;
import tconstruct.mechworks.logic.TileEntityLandmine;
-import tconstruct.smeltery.SmelteryProxyCommon;
-import tconstruct.smeltery.gui.AdaptiveSmelteryGui;
-import tconstruct.smeltery.gui.SmelteryGui;
-import tconstruct.smeltery.logic.AdaptiveSmelteryLogic;
-import tconstruct.smeltery.logic.SmelteryLogic;
-import tconstruct.tools.ToolProxyCommon;
-import tconstruct.tools.gui.CraftingStationGui;
-import tconstruct.tools.gui.FrypanGui;
-import tconstruct.tools.gui.FurnaceGui;
-import tconstruct.tools.gui.PartCrafterGui;
-import tconstruct.tools.gui.PatternChestGui;
-import tconstruct.tools.gui.StencilTableGui;
-import tconstruct.tools.gui.ToolForgeGui;
-import tconstruct.tools.gui.ToolStationGui;
-import tconstruct.tools.logic.CraftingStationLogic;
-import tconstruct.tools.logic.FrypanLogic;
-import tconstruct.tools.logic.FurnaceLogic;
-import tconstruct.tools.logic.PartBuilderLogic;
-import tconstruct.tools.logic.PatternChestLogic;
-import tconstruct.tools.logic.StencilTableLogic;
-import tconstruct.tools.logic.ToolForgeLogic;
-import tconstruct.tools.logic.ToolStationLogic;
-import tconstruct.util.config.PHConstruct;
+import cpw.mods.fml.client.registry.RenderingRegistry;
public class MechworksProxyClient extends MechworksProxyCommon
{
diff --git a/src/main/java/tconstruct/mechworks/TinkerMechworks.java b/src/main/java/tconstruct/mechworks/TinkerMechworks.java
index b22f2eb7..d7abfe30 100644
--- a/src/main/java/tconstruct/mechworks/TinkerMechworks.java
+++ b/src/main/java/tconstruct/mechworks/TinkerMechworks.java
@@ -19,7 +19,6 @@ import tconstruct.tools.TinkerTools;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
diff --git a/src/main/java/tconstruct/modifiers/accessory/GloveSpeed.java b/src/main/java/tconstruct/modifiers/accessory/GloveSpeed.java
index 190f180c..24d5145f 100644
--- a/src/main/java/tconstruct/modifiers/accessory/GloveSpeed.java
+++ b/src/main/java/tconstruct/modifiers/accessory/GloveSpeed.java
@@ -1,10 +1,8 @@
package tconstruct.modifiers.accessory;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import tconstruct.library.modifier.IModifyable;
-import tconstruct.library.tools.ToolCore;
import tconstruct.modifiers.tools.ItemModTypeFilter;
public class GloveSpeed extends ItemModTypeFilter
diff --git a/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java b/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java
index 2bf05012..fdb16375 100644
--- a/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java
+++ b/src/main/java/tconstruct/modifiers/armor/AModLeadBoots.java
@@ -3,7 +3,6 @@ package tconstruct.modifiers.armor;
import java.util.EnumSet;
import java.util.UUID;
-import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
diff --git a/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java b/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java
index 50b31110..ad26545d 100644
--- a/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java
+++ b/src/main/java/tconstruct/modifiers/armor/ActiveTinkerArmor.java
@@ -1,10 +1,5 @@
package tconstruct.modifiers.armor;
-import java.util.List;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -17,7 +12,6 @@ import tconstruct.library.armor.ArmorCore;
import tconstruct.library.armor.ArmorPart;
import tconstruct.library.modifier.ActiveArmorMod;
import tconstruct.library.modifier.IModifyable;
-import tconstruct.library.tools.AbilityHelper;
public class ActiveTinkerArmor extends ActiveArmorMod
{
diff --git a/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java b/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java
index 7e1e0c79..5e617b01 100644
--- a/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java
+++ b/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java
@@ -1,6 +1,5 @@
package tconstruct.modifiers.tools;
-import tconstruct.library.modifier.ItemModifier;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/main/java/tconstruct/modifiers/tools/ModAttack.java b/src/main/java/tconstruct/modifiers/tools/ModAttack.java
index b2caff6e..b4529c43 100644
--- a/src/main/java/tconstruct/modifiers/tools/ModAttack.java
+++ b/src/main/java/tconstruct/modifiers/tools/ModAttack.java
@@ -1,12 +1,8 @@
package tconstruct.modifiers.tools;
-import java.util.Arrays;
-import java.util.List;
-
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import tconstruct.library.modifier.IModifyable;
-import tconstruct.library.tools.ToolCore;
public class ModAttack extends ItemModTypeFilter
{
diff --git a/src/main/java/tconstruct/modifiers/tools/ModLapis.java b/src/main/java/tconstruct/modifiers/tools/ModLapis.java
index a959907a..5cab0239 100644
--- a/src/main/java/tconstruct/modifiers/tools/ModLapis.java
+++ b/src/main/java/tconstruct/modifiers/tools/ModLapis.java
@@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import tconstruct.library.tools.ToolCore;
-import tconstruct.library.tools.Weapon;
public class ModLapis extends ItemModTypeFilter
{
diff --git a/src/main/java/tconstruct/modifiers/tools/ModPiston.java b/src/main/java/tconstruct/modifiers/tools/ModPiston.java
index ce4adcf7..4905e4d2 100644
--- a/src/main/java/tconstruct/modifiers/tools/ModPiston.java
+++ b/src/main/java/tconstruct/modifiers/tools/ModPiston.java
@@ -3,11 +3,9 @@ package tconstruct.modifiers.tools;
import java.util.Arrays;
import java.util.List;
-import tconstruct.library.modifier.ItemModifier;
-import tconstruct.library.tools.ToolCore;
-
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
+import tconstruct.library.tools.ToolCore;
public class ModPiston extends ItemModTypeFilter
{
diff --git a/returning_eventually/plugins/ic2/IC2.java b/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java
similarity index 57%
rename from returning_eventually/plugins/ic2/IC2.java
rename to src/main/java/tconstruct/plugins/ic2/TinkerIC2.java
index 2637367a..80fba45e 100644
--- a/returning_eventually/plugins/ic2/IC2.java
+++ b/src/main/java/tconstruct/plugins/ic2/TinkerIC2.java
@@ -1,33 +1,29 @@
package tconstruct.plugins.ic2;
-import mantle.module.ILoadableModule;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
+
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
+import mantle.pulsar.pulse.Handler;
+import mantle.pulsar.pulse.Pulse;
import tconstruct.TConstruct;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.LiquidCasting;
-public class IC2 implements ILoadableModule
+@ObjectHolder(TConstruct.modID)
+@Pulse(id = "Tinkers IC2 Compatibility", description = "Tinkers Construct compatibility for IndustrialCraft 2", modsRequired = "IC2")
+public class TinkerIC2
{
+ private static final String IC2_UUM_FLUIDNAME = "ic2fluiduumatter";
- private static final String IC2_UUM_FLUIDNAME = "uumatter";
-
- @SuppressWarnings("unused")
- public static String modId = "IC2";
-
- @Override
- public void preInit ()
+ @Handler
+ public void init (FMLInitializationEvent event)
{
-
- }
-
- @Override
- public void init ()
- {
- TConstruct.logger.info("[IC2] Preparing for shenanigans.");
+ TConstruct.logger.info("IC2 detected. Preparing for shenanigans.");
Fluid fluidUUM = FluidRegistry.getFluid(IC2_UUM_FLUIDNAME);
if (fluidUUM == null)
@@ -39,11 +35,4 @@ public class IC2 implements ILoadableModule
// Block casting
basinCasting.addCastingRecipe(new ItemStack(Blocks.diamond_block), fluidStackBlock, new ItemStack(Blocks.dirt), true, 50);
}
-
- @Override
- public void postInit ()
- {
-
- }
-
}
diff --git a/src/main/java/tconstruct/plugins/imc/TinkerAE2.java b/src/main/java/tconstruct/plugins/imc/TinkerAE2.java
new file mode 100644
index 00000000..85650a32
--- /dev/null
+++ b/src/main/java/tconstruct/plugins/imc/TinkerAE2.java
@@ -0,0 +1,50 @@
+package tconstruct.plugins.imc;
+
+import java.util.Arrays;
+import java.util.List;
+
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
+import mantle.pulsar.pulse.Handler;
+import mantle.pulsar.pulse.Pulse;
+import tconstruct.TConstruct;
+import cpw.mods.fml.common.event.FMLInterModComms;
+
+@ObjectHolder(TConstruct.modID)
+@Pulse(id = "Tinkers AE2 Compatibility", description = "Tinkers Construct compatibility for Applied Energistics 2", modsRequired = "appliedenergistics2")
+public class TinkerAE2
+{
+ private static List spatialIOLogics = Arrays.asList(
+ "EssenceExtractorLogic", "GolemPedestalLogic", //TODO What happened to these?
+ "MultiServantLogic"); //TODO Should Mantle handle this?
+
+ private static List spatialIOSmelteryLogics = Arrays.asList("AdaptiveSmelteryLogic", "AqueductLogic", "CastingBasinLogic", "CastingChannelLogic",
+ "CastingTableLogic", "FaucetLogic", "LavaTankLogic", "SmelteryDrainLogic", "SmelteryLogic", "TankAirLogic", "TowerFurnaceLogic");
+
+ private static List spatialIOToolLogics = Arrays.asList("CraftingStationLogic", "FrypanLogic", "PartBuilderLogic", "PatternChestLogic",
+ "StencilTableLogic", "ToolForgeLogic", "ToolStationLogic");
+
+ @Handler
+ public void init (FMLInitializationEvent event)
+ {
+ TConstruct.logger.info("AE2 detected. Registering for Spatial IO.");
+
+ addtoSpatialWhitelist("tconstruct.blocks.logic.DryingRackLogic");
+ addtoSpatialWhitelist("tconstruct.mechworks.logic.TileEntityLandmine");
+
+ for(String s : spatialIOSmelteryLogics)
+ {
+ addtoSpatialWhitelist("tconstruct.smeltery.logic." + s);
+ }
+
+ for(String s : spatialIOToolLogics)
+ {
+ addtoSpatialWhitelist("tconstruct.tools.logic." + s);
+ }
+ }
+
+ public void addtoSpatialWhitelist(String teClass)
+ {
+ FMLInterModComms.sendMessage("appliedenergistics2", "whitelist-spatial", teClass);
+ }
+}
diff --git a/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java b/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java
new file mode 100644
index 00000000..72de026e
--- /dev/null
+++ b/src/main/java/tconstruct/plugins/imc/TinkerBuildCraft.java
@@ -0,0 +1,37 @@
+package tconstruct.plugins.imc;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
+import mantle.pulsar.pulse.Handler;
+import mantle.pulsar.pulse.Pulse;
+import tconstruct.TConstruct;
+import tconstruct.smeltery.TinkerSmeltery;
+
+@ObjectHolder(TConstruct.modID)
+@Pulse(id = "Tinkers BuildCraft Compatibility", description = "Tinkers Construct compatibility for BC Transport", modsRequired = "BuildCraft|Transport")
+public class TinkerBuildCraft
+{
+ @Handler
+ public void init(FMLInitializationEvent event)
+ {
+ TConstruct.logger.info("BuildCraft detected. Registering facades.");
+ // Smeltery Blocks
+ addFacade(TinkerSmeltery.smeltery, 2);
+ for (int sc = 4; sc < 11; sc++)
+ {
+ addFacade(TinkerSmeltery.smeltery, sc);
+ }
+
+ addFacade(TinkerSmeltery.searedBlock, 0);
+ addFacade(TinkerSmeltery.searedBlockNether, 0);
+ }
+
+ private void addFacade (Block b, int meta)
+ {
+ FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", new ItemStack(b, 1, meta));
+ }
+}
diff --git a/returning_eventually/plugins/imc/Mystcraft.java b/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java
similarity index 68%
rename from returning_eventually/plugins/imc/Mystcraft.java
rename to src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java
index ad983c68..798d8f99 100644
--- a/returning_eventually/plugins/imc/Mystcraft.java
+++ b/src/main/java/tconstruct/plugins/imc/TinkerMystcraft.java
@@ -1,39 +1,29 @@
package tconstruct.plugins.imc;
-import mantle.module.ILoadableModule;
import net.minecraft.nbt.NBTTagCompound;
-import tconstruct.TConstruct;
+
+import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLInterModComms;
+import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
+import mantle.pulsar.pulse.Handler;
+import mantle.pulsar.pulse.Pulse;
+import tconstruct.TConstruct;
-public class Mystcraft implements ILoadableModule
+@ObjectHolder(TConstruct.modID)
+@Pulse(id = "Tinkers Mystcraft Compatibility", forced = true, modsRequired = "Mystcraft")
+public class TinkerMystcraft
{
-
private static String[] fluids = new String[] { "invar.molten", "electrum.molten", "bronze.molten", "aluminumbrass.molten", "manyullyn.molten", "alumite.molten", "cobalt.molten", "moltenArdite",
"ender", "steel.molten", "platinum.molten" };
- @SuppressWarnings("unused")
- public static String modId = "Mystcraft";
-
- @Override
- public void preInit ()
+ @Handler
+ public void init (FMLInitializationEvent event)
{
-
- }
-
- @Override
- public void init ()
- {
- TConstruct.logger.info("[Mystcraft] Blacklisting Mystcraft fluid symbols.");
+ TConstruct.logger.info("Mystcraft detected. Blacklisting Mystcraft fluid symbols.");
for (String nm : fluids)
sendFluidBlacklist(nm);
}
- @Override
- public void postInit ()
- {
-
- }
-
private void sendFluidBlacklist (String FluidName)
{
NBTTagCompound NBTMsg = new NBTTagCompound();
diff --git a/src/main/java/tconstruct/plugins/imc/TinkerThaumcraft.java b/src/main/java/tconstruct/plugins/imc/TinkerThaumcraft.java
index bad0b53b..27fb7ed6 100644
--- a/src/main/java/tconstruct/plugins/imc/TinkerThaumcraft.java
+++ b/src/main/java/tconstruct/plugins/imc/TinkerThaumcraft.java
@@ -1,11 +1,9 @@
package tconstruct.plugins.imc;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
+import net.minecraft.item.ItemStack;
import tconstruct.TConstruct;
-import tconstruct.smeltery.TinkerSmeltery;
import tconstruct.world.TinkerWorld;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLInterModComms;
@@ -19,7 +17,7 @@ public class TinkerThaumcraft
@Handler
public void init (FMLInitializationEvent event)
{
- TConstruct.logger.info("[Thaumcraft] Registering harvestables.");
+ TConstruct.logger.info("Thaumcraft detected. Registering harvestables.");
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 12));
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 13));
FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(TinkerWorld.oreBerry, 1, 14));
diff --git a/returning_eventually/plugins/minefactoryreloaded/Drinkables.java b/src/main/java/tconstruct/plugins/mfr/Drinkables.java
similarity index 57%
rename from returning_eventually/plugins/minefactoryreloaded/Drinkables.java
rename to src/main/java/tconstruct/plugins/mfr/Drinkables.java
index 8c785239..d978a881 100644
--- a/returning_eventually/plugins/minefactoryreloaded/Drinkables.java
+++ b/src/main/java/tconstruct/plugins/mfr/Drinkables.java
@@ -1,25 +1,25 @@
-package tconstruct.plugins.minefactoryreloaded;
+package tconstruct.plugins.mfr;
import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
+
import powercrystals.minefactoryreloaded.api.ILiquidDrinkHandler;
public class Drinkables implements ILiquidDrinkHandler
{
@Override
- public void onDrink (EntityPlayer player)
+ public void onDrink (EntityLivingBase entity)
{
//boost health when drink
- if (player != null)
+ if (entity != null)
{
- PotionEffect potion = player.getActivePotionEffect(Potion.field_76434_w);
+ PotionEffect potion = entity.getActivePotionEffect(Potion.field_76434_w);
int duration = 0;
if (potion != null)
- duration = potion.duration;
- player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, duration + 20 * 30, 0));
+ duration = potion.getDuration();
+ entity.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, duration + 20 * 30, 0));
}
}
diff --git a/returning_eventually/plugins/minefactoryreloaded/GrindableHorse.java b/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java
similarity index 76%
rename from returning_eventually/plugins/minefactoryreloaded/GrindableHorse.java
rename to src/main/java/tconstruct/plugins/mfr/GrindableHorse.java
index db2859ff..027e4eef 100644
--- a/returning_eventually/plugins/minefactoryreloaded/GrindableHorse.java
+++ b/src/main/java/tconstruct/plugins/mfr/GrindableHorse.java
@@ -1,4 +1,4 @@
-package tconstruct.plugins.minefactoryreloaded;
+package tconstruct.plugins.mfr;
import java.util.ArrayList;
import java.util.List;
@@ -8,14 +8,15 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+
import powercrystals.minefactoryreloaded.api.IFactoryGrindable;
import powercrystals.minefactoryreloaded.api.MobDrop;
-import tconstruct.common.TRepo;
+import tconstruct.tools.TinkerTools;
public class GrindableHorse implements IFactoryGrindable
{
@Override
- public Class> getGrindableEntity ()
+ public Class extends EntityLivingBase> getGrindableEntity ()
{
return EntityHorse.class;
}
@@ -25,7 +26,7 @@ public class GrindableHorse implements IFactoryGrindable
{
List drops = new ArrayList();
- drops.add(new MobDrop(10, new ItemStack(TRepo.materials, random.nextInt(4) + 1, 36)));
+ drops.add(new MobDrop(10, new ItemStack(TinkerTools.materials, random.nextInt(4) + 1, 36)));
return drops;
}
diff --git a/returning_eventually/plugins/minefactoryreloaded/HarvestableOreBerry.java b/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java
similarity index 72%
rename from returning_eventually/plugins/minefactoryreloaded/HarvestableOreBerry.java
rename to src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java
index fbb06da8..be5ac46d 100644
--- a/returning_eventually/plugins/minefactoryreloaded/HarvestableOreBerry.java
+++ b/src/main/java/tconstruct/plugins/mfr/HarvestableOreBerry.java
@@ -1,32 +1,35 @@
-package tconstruct.plugins.minefactoryreloaded;
+package tconstruct.plugins.mfr;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Random;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+
import powercrystals.minefactoryreloaded.api.HarvestType;
import powercrystals.minefactoryreloaded.api.IFactoryHarvestable;
public class HarvestableOreBerry implements IFactoryHarvestable
{
- private int _sourceBlockId;
- private int _berryItemId;
+ private Block _sourceBlock;
+ private Item _berryItem;
private int _metaOffset;
- public HarvestableOreBerry(int sourceBlockId, int berryItemId, int metaOffset)
+ public HarvestableOreBerry(Block sourceBlock, Item berryItem, int metaOffset)
{
- _sourceBlockId = sourceBlockId;
- _berryItemId = berryItemId;
+ _sourceBlock = sourceBlock;
+ _berryItem = berryItem;
_metaOffset = metaOffset;
}
@Override
- public int getPlantId ()
+ public Block getPlant ()
{
- return _sourceBlockId;
+ return _sourceBlock;
}
@Override
@@ -50,7 +53,7 @@ public class HarvestableOreBerry implements IFactoryHarvestable
@Override
public List getDrops (World world, Random rand, Map harvesterSettings, int x, int y, int z)
{
- ItemStack[] returnItems = { new ItemStack(_berryItemId, 1, world.getBlockMetadata(x, y, z) % 4 + _metaOffset) };
+ ItemStack[] returnItems = { new ItemStack(_berryItem, 1, world.getBlockMetadata(x, y, z) % 4 + _metaOffset) };
return Arrays.asList(returnItems);
}
diff --git a/src/main/java/tconstruct/plugins/mfr/MFRRegister.java b/src/main/java/tconstruct/plugins/mfr/MFRRegister.java
new file mode 100644
index 00000000..ff0c18b8
--- /dev/null
+++ b/src/main/java/tconstruct/plugins/mfr/MFRRegister.java
@@ -0,0 +1,17 @@
+package tconstruct.plugins.mfr;
+
+import powercrystals.minefactoryreloaded.api.FactoryRegistry;
+import powercrystals.minefactoryreloaded.api.ValuedItem;
+import tconstruct.smeltery.TinkerSmeltery;
+import tconstruct.world.TinkerWorld;
+
+public class MFRRegister
+{
+ public static void registerWithMFR ()
+ {
+ FactoryRegistry.sendMessage("registerHarvestable", new HarvestableOreBerry(TinkerWorld.oreBerry, TinkerWorld.oreBerries, 0));
+ FactoryRegistry.sendMessage("registerHarvestable", new HarvestableOreBerry(TinkerWorld.oreBerrySecond, TinkerWorld.oreBerries, 4));
+ FactoryRegistry.sendMessage("registerGrindable", new GrindableHorse());
+ FactoryRegistry.sendMessage("registerLiquidDrinkHandler", new ValuedItem(TinkerSmeltery.bloodFluid.getName(), new Drinkables()));
+ }
+}
diff --git a/returning_eventually/plugins/minefactoryreloaded/MineFactoryReloaded.java b/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java
similarity index 53%
rename from returning_eventually/plugins/minefactoryreloaded/MineFactoryReloaded.java
rename to src/main/java/tconstruct/plugins/mfr/TinkerMFR.java
index d9c4b31b..942dc966 100644
--- a/returning_eventually/plugins/minefactoryreloaded/MineFactoryReloaded.java
+++ b/src/main/java/tconstruct/plugins/mfr/TinkerMFR.java
@@ -1,22 +1,17 @@
-package tconstruct.plugins.minefactoryreloaded;
+package tconstruct.plugins.mfr;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
+import mantle.pulsar.pulse.Handler;
+import mantle.pulsar.pulse.Pulse;
import tconstruct.TConstruct;
-import tconstruct.plugins.ICompatPlugin;
-public class MineFactoryReloaded implements ICompatPlugin
+@ObjectHolder(TConstruct.modID)
+@Pulse(id = "Tinkers MFR Compatibility", description = "Tinkers Construct compatibility for MineFactory Reloaded", modsRequired = "MineFactoryReloaded")
+public class TinkerMFR
{
- @Override
- public String getModId() {
- return "MineFactoryReloaded";
- }
-
- @Override
- public void preInit() {
- // Nothing
- }
-
- @Override
- public void init()
+ @Handler
+ public void init (FMLInitializationEvent event)
{
TConstruct.logger.info("MineFactoryReloaded detected. Registering TConstruct farmables/grindables with MFR's Farming Registry.");
MFRRegister.registerWithMFR();
@@ -26,10 +21,4 @@ public class MineFactoryReloaded implements ICompatPlugin
* Currently used weights are from about 50 (emerald) to 175 (coal).
*/
}
-
- @Override
- public void postInit() {
- // Nothing
- }
-
}
\ No newline at end of file
diff --git a/src/main/java/tconstruct/plugins/nei/TinkerNEI.java b/src/main/java/tconstruct/plugins/nei/TinkerNEI.java
index d3326fa2..a9b5b355 100644
--- a/src/main/java/tconstruct/plugins/nei/TinkerNEI.java
+++ b/src/main/java/tconstruct/plugins/nei/TinkerNEI.java
@@ -3,10 +3,8 @@ package tconstruct.plugins.nei;
import mantle.pulsar.pulse.Handler;
import mantle.pulsar.pulse.Pulse;
import tconstruct.TConstruct;
-import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
-import cpw.mods.fml.relauncher.Side;
@ObjectHolder(TConstruct.modID)
@Pulse(id = "Tinkers NEI Compatibility", description = "Tinkers Construct compatibility for NEI", modsRequired = "NotEnoughItems")
diff --git a/src/main/java/tconstruct/plugins/te4/TE4Helper.java b/src/main/java/tconstruct/plugins/te4/TE4Helper.java
new file mode 100644
index 00000000..3b86e130
--- /dev/null
+++ b/src/main/java/tconstruct/plugins/te4/TE4Helper.java
@@ -0,0 +1,240 @@
+package tconstruct.plugins.te4;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
+import cpw.mods.fml.common.event.FMLInterModComms;
+
+/**
+ * Taken from CoFHLib
+ *
+ * @author KingLemming
+ */
+public class TE4Helper
+{
+
+ public static void addFurnaceRecipe(int energy, ItemStack input, ItemStack output) {
+
+ if (input == null || output == null) {
+ return;
+ }
+ NBTTagCompound toSend = new NBTTagCompound();
+
+ toSend.setInteger("energy", energy);
+ toSend.setTag("input", new NBTTagCompound());
+ toSend.setTag("output", new NBTTagCompound());
+
+ input.writeToNBT(toSend.getCompoundTag("input"));
+ output.writeToNBT(toSend.getCompoundTag("output"));
+ FMLInterModComms.sendMessage("ThermalExpansion", "FurnaceRecipe", toSend);
+ }
+
+ public static void addPulverizerRecipe(int energy, ItemStack input, ItemStack primaryOutput) {
+
+ addPulverizerRecipe(energy, input, primaryOutput, null, 0);
+ }
+
+ public static void addPulverizerRecipe(int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) {
+
+ addPulverizerRecipe(energy, input, primaryOutput, secondaryOutput, 100);
+ }
+
+ public static void addPulverizerRecipe(int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) {
+
+ if (input == null || primaryOutput == null || secondaryOutput == null) {
+ return;
+ }
+ NBTTagCompound toSend = new NBTTagCompound();
+
+ toSend.setInteger("energy", energy);
+ toSend.setTag("input", new NBTTagCompound());
+ toSend.setTag("primaryOutput", new NBTTagCompound());
+ toSend.setTag("secondaryOutput", new NBTTagCompound());
+
+ input.writeToNBT(toSend.getCompoundTag("input"));
+ primaryOutput.writeToNBT(toSend.getCompoundTag("primaryOutput"));
+ secondaryOutput.writeToNBT(toSend.getCompoundTag("secondaryOutput"));
+ toSend.setInteger("secondaryChance", secondaryChance);
+
+ FMLInterModComms.sendMessage("ThermalExpansion", "PulverizerRecipe", toSend);
+ }
+
+ public static void addSawmillRecipe(int energy, ItemStack input, ItemStack primaryOutput) {
+
+ addSawmillRecipe(energy, input, primaryOutput, null, 0);
+ }
+
+ public static void addSawmillRecipe(int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput) {
+
+ addSawmillRecipe(energy, input, primaryOutput, secondaryOutput, 100);
+ }
+
+ public static void addSawmillRecipe(int energy, ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, int secondaryChance) {
+
+ if (input == null || primaryOutput == null || secondaryOutput == null) {
+ return;
+ }
+ NBTTagCompound toSend = new NBTTagCompound();
+
+ toSend.setInteger("energy", energy);
+ toSend.setTag("input", new NBTTagCompound());
+ toSend.setTag("primaryOutput", new NBTTagCompound());
+ toSend.setTag("secondaryOutput", new NBTTagCompound());
+
+ input.writeToNBT(toSend.getCompoundTag("input"));
+ primaryOutput.writeToNBT(toSend.getCompoundTag("primaryOutput"));
+ secondaryOutput.writeToNBT(toSend.getCompoundTag("secondaryOutput"));
+ toSend.setInteger("secondaryChance", secondaryChance);
+
+ FMLInterModComms.sendMessage("ThermalExpansion", "SawmillRecipe", toSend);
+ }
+
+ public static void addSmelterRecipe(int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput) {
+
+ addSmelterRecipe(energy, primaryInput, secondaryInput, primaryOutput, null, 0);
+ }
+
+ public static void addSmelterRecipe(int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput, ItemStack secondaryOutput) {
+
+ addSmelterRecipe(energy, primaryInput, secondaryInput, primaryOutput, secondaryOutput, 100);
+ }
+
+ public static void addSmelterRecipe(int energy, ItemStack primaryInput, ItemStack secondaryInput, ItemStack primaryOutput, ItemStack secondaryOutput,
+ int secondaryChance) {
+
+ if (primaryInput == null || secondaryInput == null || primaryOutput == null || secondaryOutput == null) {
+ return;
+ }
+ NBTTagCompound toSend = new NBTTagCompound();
+
+ toSend.setInteger("energy", energy);
+ toSend.setTag("primaryInput", new NBTTagCompound());
+ toSend.setTag("secondaryInput", new NBTTagCompound());
+ toSend.setTag("primaryOutput", new NBTTagCompound());
+ toSend.setTag("secondaryOutput", new NBTTagCompound());
+
+ primaryInput.writeToNBT(toSend.getCompoundTag("primaryInput"));
+ secondaryInput.writeToNBT(toSend.getCompoundTag("secondaryInput"));
+ primaryOutput.writeToNBT(toSend.getCompoundTag("primaryOutput"));
+ secondaryOutput.writeToNBT(toSend.getCompoundTag("secondaryOutput"));
+ toSend.setInteger("secondaryChance", secondaryChance);
+
+ FMLInterModComms.sendMessage("ThermalExpansion", "SmelterRecipe", toSend);
+ }
+
+ /**
+ * Use this to register an Ore TYPE as a "Blast" recipe - it will require Pyrotheum Dust to smelt. Do not add the prefix. This is an opt-in for ores which
+ * do NOT have vanilla furnace recipes.
+ *
+ * Ex: "Steel" or "ElectrumFlux", not "dustSteel" or "dustElectrumFlux"
+ *
+ * @param oreType
+ */
+ public static void addSmelterBlastOre(String oreType) {
+
+ NBTTagCompound toSend = new NBTTagCompound();
+
+ toSend.setString("oreType", oreType);
+
+ FMLInterModComms.sendMessage("ThermalExpansion", "SmelterBlastOreType", toSend);
+ }
+
+ public static void addCrucibleRecipe(int energy, ItemStack input, FluidStack output) {
+
+ if (input == null || output == null) {
+ return;
+ }
+ NBTTagCompound toSend = new NBTTagCompound();
+
+ toSend.setInteger("energy", energy);
+ toSend.setTag("input", new NBTTagCompound());
+ toSend.setTag("output", new NBTTagCompound());
+
+ input.writeToNBT(toSend.getCompoundTag("input"));
+ output.writeToNBT(toSend.getCompoundTag("output"));
+
+ FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend);
+ }
+
+ public static void addTransposerFill(int energy, ItemStack input, ItemStack output, FluidStack fluid, boolean reversible) {
+
+ if (input == null || output == null || fluid == null) {
+ return;
+ }
+ NBTTagCompound toSend = new NBTTagCompound();
+
+ toSend.setInteger("energy", energy);
+ toSend.setTag("input", new NBTTagCompound());
+ toSend.setTag("output", new NBTTagCompound());
+ toSend.setTag("fluid", new NBTTagCompound());
+
+ input.writeToNBT(toSend.getCompoundTag("input"));
+ output.writeToNBT(toSend.getCompoundTag("output"));
+ toSend.setBoolean("reversible", reversible);
+ fluid.writeToNBT(toSend.getCompoundTag("fluid"));
+
+ FMLInterModComms.sendMessage("ThermalExpansion", "TransposerFillRecipe", toSend);
+ }
+
+ public static void addTransposerExtract(int energy, ItemStack input, ItemStack output, FluidStack fluid, int chance, boolean reversible) {
+
+ if (input == null || output == null || fluid == null) {
+ return;
+ }
+ NBTTagCompound toSend = new NBTTagCompound();
+
+ toSend.setInteger("energy", energy);
+ toSend.setTag("input", new NBTTagCompound());
+ toSend.setTag("output", new NBTTagCompound());
+ toSend.setTag("fluid", new NBTTagCompound());
+
+ input.writeToNBT(toSend.getCompoundTag("input"));
+ output.writeToNBT(toSend.getCompoundTag("output"));
+ toSend.setBoolean("reversible", reversible);
+ toSend.setInteger("chance", chance);
+ fluid.writeToNBT(toSend.getCompoundTag("fluid"));
+
+ FMLInterModComms.sendMessage("ThermalExpansion", "TransposerExtractRecipe", toSend);
+ }
+
+ public static void addMagmaticFuel(String fluidName, int energy) {
+
+ NBTTagCompound toSend = new NBTTagCompound();
+
+ toSend.setString("fluidName", fluidName);
+ toSend.setInteger("energy", energy);
+
+ FMLInterModComms.sendMessage("ThermalExpansion", "MagmaticFuel", toSend);
+ }
+
+ public static void addCompressionFuel(String fluidName, int energy) {
+
+ NBTTagCompound toSend = new NBTTagCompound();
+
+ toSend.setString("fluidName", fluidName);
+ toSend.setInteger("energy", energy);
+
+ FMLInterModComms.sendMessage("ThermalExpansion", "CompressionFuel", toSend);
+ }
+
+ public static void addReactantFuel(String fluidName, int energy) {
+
+ NBTTagCompound toSend = new NBTTagCompound();
+
+ toSend.setString("fluidName", fluidName);
+ toSend.setInteger("energy", energy);
+
+ FMLInterModComms.sendMessage("ThermalExpansion", "ReactantFuel", toSend);
+ }
+
+ public static void addCoolant(String fluidName, int energy) {
+
+ NBTTagCompound toSend = new NBTTagCompound();
+
+ toSend.setString("fluidName", fluidName);
+ toSend.setInteger("energy", energy);
+
+ FMLInterModComms.sendMessage("ThermalExpansion", "Coolant", toSend);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/tconstruct/plugins/te4/TinkerTE4.java b/src/main/java/tconstruct/plugins/te4/TinkerTE4.java
new file mode 100644
index 00000000..57a20176
--- /dev/null
+++ b/src/main/java/tconstruct/plugins/te4/TinkerTE4.java
@@ -0,0 +1,37 @@
+package tconstruct.plugins.te4;
+
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
+import mantle.pulsar.pulse.Handler;
+import mantle.pulsar.pulse.Pulse;
+import tconstruct.TConstruct;
+import tconstruct.tools.TinkerTools;
+import tconstruct.world.TinkerWorld;
+
+@ObjectHolder(TConstruct.modID)
+@Pulse(id = "Tinkers TE4 Compatibility", description = "Tinkers Construct compatibility for Thermal Expansion", modsRequired = "ThermalExpansion")
+public class TinkerTE4
+{
+ @Handler
+ public void init ()
+ {
+ TConstruct.logger.info("Thermal Expansion detected. Adding Pulverizer & Induction Smelter recipes");
+ ItemStack crystalCinnabar = OreDictionary.getOres("crystalCinnabar").get(0);
+
+ TE4Helper.addPulverizerRecipe(1000, new ItemStack(TinkerTools.materials, 1, 11), new ItemStack(TinkerTools.materials, 1, 40), null, 0);
+ TE4Helper.addPulverizerRecipe(1000, new ItemStack(TinkerTools.materials, 1, 3), new ItemStack(TinkerTools.materials, 1, 39), null, 0);
+ TE4Helper.addPulverizerRecipe(1000, new ItemStack(TinkerTools.materials, 1, 4), new ItemStack(TinkerTools.materials, 1, 38), null, 0);
+
+ TE4Helper.addPulverizerRecipe(12000, new ItemStack(TinkerWorld.oreSlag, 1, 1), new ItemStack(TinkerTools.materials, 2, 39), GameRegistry.findItemStack("ThermalExpansion", "dustIron", 1), 10);
+ TE4Helper.addSmelterRecipe(12000, new ItemStack(TinkerWorld.oreSlag, 1, 1), crystalCinnabar.copy(), new ItemStack(TinkerTools.materials, 3, 3), new ItemStack(Items.iron_ingot), 100);
+ TE4Helper.addPulverizerRecipe(12000, new ItemStack(TinkerWorld.oreSlag, 1, 2), new ItemStack(TinkerTools.materials, 2, 38), GameRegistry.findItemStack("ThermalExpansion", "dustGold", 1), 10);
+ TE4Helper.addSmelterRecipe(12000, new ItemStack(TinkerWorld.oreSlag, 1, 2), crystalCinnabar.copy(), new ItemStack(TinkerTools.materials, 3, 4), new ItemStack(Items.gold_ingot), 100);
+
+ TE4Helper.addSmelterRecipe(4000, new ItemStack(TinkerTools.materials, 1, 4), new ItemStack(TinkerTools.materials, 1, 3), new ItemStack(TinkerTools.materials, 1, 5), null, 0);
+ TE4Helper.addSmelterRecipe(4000, new ItemStack(TinkerTools.materials, 1, 9), new ItemStack(TinkerTools.materials, 3, 11), new ItemStack(TinkerTools.materials, 4, 14), null, 0);
+ }
+}
diff --git a/returning_eventually/plugins/waila/BasinDataProvider.java b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java
similarity index 97%
rename from returning_eventually/plugins/waila/BasinDataProvider.java
rename to src/main/java/tconstruct/plugins/waila/BasinDataProvider.java
index 60bcede4..8e516562 100644
--- a/returning_eventually/plugins/waila/BasinDataProvider.java
+++ b/src/main/java/tconstruct/plugins/waila/BasinDataProvider.java
@@ -5,7 +5,7 @@ import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
-import tconstruct.blocks.logic.CastingBasinLogic;
+import tconstruct.smeltery.logic.CastingBasinLogic;
import java.util.List;
diff --git a/returning_eventually/plugins/waila/CastingChannelDataProvider.java b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java
similarity index 98%
rename from returning_eventually/plugins/waila/CastingChannelDataProvider.java
rename to src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java
index 3612e234..6881d5e4 100644
--- a/returning_eventually/plugins/waila/CastingChannelDataProvider.java
+++ b/src/main/java/tconstruct/plugins/waila/CastingChannelDataProvider.java
@@ -10,7 +10,7 @@ import net.minecraft.util.StatCollector;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
-import tconstruct.blocks.logic.CastingChannelLogic;
+import tconstruct.smeltery.logic.CastingChannelLogic;
public class CastingChannelDataProvider implements IWailaDataProvider
{
diff --git a/returning_eventually/plugins/waila/SearedTankDataProvider.java b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java
similarity index 97%
rename from returning_eventually/plugins/waila/SearedTankDataProvider.java
rename to src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java
index 8fe58d67..048e73dc 100644
--- a/returning_eventually/plugins/waila/SearedTankDataProvider.java
+++ b/src/main/java/tconstruct/plugins/waila/SearedTankDataProvider.java
@@ -5,7 +5,7 @@ import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
-import tconstruct.blocks.logic.LavaTankLogic;
+import tconstruct.smeltery.logic.LavaTankLogic;
import java.util.List;
diff --git a/returning_eventually/plugins/waila/SmelteryDataProvider.java b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java
similarity index 97%
rename from returning_eventually/plugins/waila/SmelteryDataProvider.java
rename to src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java
index 74eb6800..4aa27af2 100644
--- a/returning_eventually/plugins/waila/SmelteryDataProvider.java
+++ b/src/main/java/tconstruct/plugins/waila/SmelteryDataProvider.java
@@ -5,7 +5,7 @@ import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
-import tconstruct.blocks.logic.SmelteryLogic;
+import tconstruct.smeltery.logic.SmelteryLogic;
import java.util.List;
diff --git a/returning_eventually/plugins/waila/TableDataProvider.java b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java
similarity index 97%
rename from returning_eventually/plugins/waila/TableDataProvider.java
rename to src/main/java/tconstruct/plugins/waila/TableDataProvider.java
index c42811c5..54e59909 100644
--- a/returning_eventually/plugins/waila/TableDataProvider.java
+++ b/src/main/java/tconstruct/plugins/waila/TableDataProvider.java
@@ -4,7 +4,7 @@ import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
import mcp.mobius.waila.api.IWailaDataProvider;
import net.minecraft.item.ItemStack;
-import tconstruct.blocks.logic.CastingTableLogic;
+import tconstruct.smeltery.logic.CastingTableLogic;
import java.util.List;
diff --git a/src/main/java/tconstruct/plugins/waila/TinkerWaila.java b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java
new file mode 100644
index 00000000..2cd8cb7d
--- /dev/null
+++ b/src/main/java/tconstruct/plugins/waila/TinkerWaila.java
@@ -0,0 +1,20 @@
+package tconstruct.plugins.waila;
+
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder;
+import cpw.mods.fml.common.event.FMLInterModComms;
+import mantle.pulsar.pulse.Handler;
+import mantle.pulsar.pulse.Pulse;
+import tconstruct.TConstruct;
+
+@ObjectHolder(TConstruct.modID)
+@Pulse(id = "Tinkers Waila Compatibility", description = "Tinkers Construct compatibility for Waila", modsRequired = "Waila")
+public class TinkerWaila
+{
+ @Handler
+ public void init (FMLInitializationEvent event)
+ {
+ TConstruct.logger.info("Waila detected. Registering TConstruct tank blocks with Waila registry.");
+ FMLInterModComms.sendMessage("Waila", "register", "tconstruct.plugins.waila.WailaRegistrar.wailaCallback");
+ }
+}
diff --git a/returning_eventually/plugins/waila/WailaRegistrar.java b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java
similarity index 80%
rename from returning_eventually/plugins/waila/WailaRegistrar.java
rename to src/main/java/tconstruct/plugins/waila/WailaRegistrar.java
index 1537294f..167a491e 100644
--- a/returning_eventually/plugins/waila/WailaRegistrar.java
+++ b/src/main/java/tconstruct/plugins/waila/WailaRegistrar.java
@@ -1,15 +1,13 @@
package tconstruct.plugins.waila;
import mcp.mobius.waila.api.IWailaRegistrar;
-import net.minecraft.util.StatCollector;
-import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import tconstruct.TConstruct;
-import tconstruct.blocks.LavaTankBlock;
-import tconstruct.blocks.SmelteryBlock;
-import tconstruct.blocks.logic.CastingBasinLogic;
-import tconstruct.blocks.logic.CastingChannelLogic;
-import tconstruct.blocks.logic.CastingTableLogic;
+import tconstruct.smeltery.blocks.LavaTankBlock;
+import tconstruct.smeltery.blocks.SmelteryBlock;
+import tconstruct.smeltery.logic.CastingBasinLogic;
+import tconstruct.smeltery.logic.CastingChannelLogic;
+import tconstruct.smeltery.logic.CastingTableLogic;
public class WailaRegistrar
{
@@ -39,7 +37,7 @@ public class WailaRegistrar
public static String fluidNameHelper (FluidStack f)
{
- return f.getFluid().getLocalizedName();
+ return f.getFluid().getLocalizedName(f);
}
}
diff --git a/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java b/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java
index f7e0ae26..6c126e9a 100644
--- a/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java
+++ b/src/main/java/tconstruct/smeltery/SmelteryProxyCommon.java
@@ -1,11 +1,10 @@
package tconstruct.smeltery;
-import tconstruct.common.TProxyCommon;
import mantle.blocks.abstracts.InventoryLogic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
+import tconstruct.common.TProxyCommon;
import cpw.mods.fml.common.network.IGuiHandler;
public class SmelteryProxyCommon implements IGuiHandler
diff --git a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java
index ae32dd2e..6c511a82 100644
--- a/src/main/java/tconstruct/smeltery/TinkerSmeltery.java
+++ b/src/main/java/tconstruct/smeltery/TinkerSmeltery.java
@@ -344,9 +344,9 @@ public class TinkerSmeltery
TinkerSmeltery.moltenEmeraldFluid = new Fluid("emerald.liquid");
if (!FluidRegistry.registerFluid(TinkerSmeltery.moltenEmeraldFluid))
TinkerSmeltery.moltenEmeraldFluid = FluidRegistry.getFluid("emerald.liquid");
- TinkerSmeltery.moltenEmerald = new TConstructFluid(TinkerSmeltery.moltenEmeraldFluid, Material.water, "liquid_villager").setBlockName("molten.emerald");
+ TinkerSmeltery.moltenEmerald = new TConstructFluid(TinkerSmeltery.moltenEmeraldFluid, Material.lava, "liquid_villager").setBlockName("molten.emerald");
GameRegistry.registerBlock(TinkerSmeltery.moltenEmerald, "molten.emerald");
- TinkerSmeltery.moltenEmeraldFluid.setBlock(TinkerSmeltery.moltenEmerald).setDensity(3000).setViscosity(6000).setTemperature(1300);
+ TinkerSmeltery.moltenEmeraldFluid.setBlock(TinkerSmeltery.moltenEmerald).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TinkerSmeltery.moltenEmeraldFluid, 1000), new ItemStack(TinkerSmeltery.buckets, 1, 15), new ItemStack(
Items.bucket)));
diff --git a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java
index aacf5f39..df0d9857 100644
--- a/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java
+++ b/src/main/java/tconstruct/smeltery/blocks/CastingChannelBlock.java
@@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
import tconstruct.library.TConstructRegistry;
import tconstruct.smeltery.logic.CastingChannelLogic;
import tconstruct.smeltery.model.BlockRenderCastingChannel;
diff --git a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java
index 8365263e..9ab5b46e 100644
--- a/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java
+++ b/src/main/java/tconstruct/smeltery/blocks/LavaTankBlock.java
@@ -11,7 +11,6 @@ import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -21,10 +20,8 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidContainerRegistry;
-import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
-import tconstruct.TConstruct;
import tconstruct.library.TConstructRegistry;
import tconstruct.smeltery.logic.LavaTankLogic;
import tconstruct.smeltery.model.TankRender;
diff --git a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java
index 684e2ac1..9bf0375f 100644
--- a/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java
+++ b/src/main/java/tconstruct/smeltery/blocks/SearedBlock.java
@@ -15,8 +15,6 @@ import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.IFluidHandler;
import tconstruct.TConstruct;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.event.SmelteryEvent;
diff --git a/src/main/java/tconstruct/smeltery/blocks/TankAirBlock.java b/src/main/java/tconstruct/smeltery/blocks/TankAirBlock.java
index 2cf45c42..bf2902b6 100644
--- a/src/main/java/tconstruct/smeltery/blocks/TankAirBlock.java
+++ b/src/main/java/tconstruct/smeltery/blocks/TankAirBlock.java
@@ -15,7 +15,6 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
-import net.minecraftforge.common.ForgeHooks;
import tconstruct.smeltery.logic.TankAirLogic;
import tconstruct.smeltery.model.TankAirRender;
import cpw.mods.fml.relauncher.Side;
diff --git a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java
index f9065f6d..3acc15fd 100644
--- a/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java
+++ b/src/main/java/tconstruct/smeltery/gui/SmelteryGui.java
@@ -14,7 +14,6 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
-import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import org.lwjgl.input.Mouse;
diff --git a/src/main/java/tconstruct/smeltery/logic/AdaptiveDrainLogic.java b/src/main/java/tconstruct/smeltery/logic/AdaptiveDrainLogic.java
index 12e80602..d23975d1 100644
--- a/src/main/java/tconstruct/smeltery/logic/AdaptiveDrainLogic.java
+++ b/src/main/java/tconstruct/smeltery/logic/AdaptiveDrainLogic.java
@@ -1,7 +1,5 @@
package tconstruct.smeltery.logic;
-import tconstruct.TConstruct;
-import tconstruct.library.crafting.AlloyMix;
import mantle.blocks.abstracts.MultiServantLogic;
import mantle.blocks.iface.IFacingLogic;
import mantle.blocks.iface.IMasterLogic;
diff --git a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java
index 7ecfc388..c1e5ee42 100644
--- a/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java
+++ b/src/main/java/tconstruct/smeltery/logic/CastingChannelLogic.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Set;
-import mantle.blocks.iface.IActiveLogic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.NetworkManager;
@@ -13,12 +12,10 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidEvent;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
-import net.minecraftforge.fluids.IFluidTank;
import tconstruct.TConstruct;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
diff --git a/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java
index 0f4f7b8c..f335d134 100644
--- a/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java
+++ b/src/main/java/tconstruct/smeltery/logic/FaucetLogic.java
@@ -1,6 +1,5 @@
package tconstruct.smeltery.logic;
-import tconstruct.TConstruct;
import mantle.blocks.iface.IActiveLogic;
import mantle.blocks.iface.IFacingLogic;
import net.minecraft.entity.EntityLivingBase;
@@ -9,12 +8,12 @@ import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MathHelper;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
+import tconstruct.TConstruct;
public class FaucetLogic extends TileEntity implements IFacingLogic, IActiveLogic, IFluidHandler
{
diff --git a/src/main/java/tconstruct/tools/TActiveOmniMod.java b/src/main/java/tconstruct/tools/TActiveOmniMod.java
index d49b417e..f19100d4 100644
--- a/src/main/java/tconstruct/tools/TActiveOmniMod.java
+++ b/src/main/java/tconstruct/tools/TActiveOmniMod.java
@@ -2,7 +2,6 @@ package tconstruct.tools;
import java.util.Random;
-import mantle.world.WorldHelper;
import net.minecraft.block.Block;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
@@ -21,7 +20,6 @@ import net.minecraft.world.World;
import tconstruct.library.ActiveToolMod;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.ToolCore;
-import tconstruct.tools.TinkerTools;
import tconstruct.util.config.PHConstruct;
import tconstruct.world.TinkerWorld;
diff --git a/src/main/java/tconstruct/tools/TinkerToolEvents.java b/src/main/java/tconstruct/tools/TinkerToolEvents.java
index c32ed42b..31b12ae4 100644
--- a/src/main/java/tconstruct/tools/TinkerToolEvents.java
+++ b/src/main/java/tconstruct/tools/TinkerToolEvents.java
@@ -4,14 +4,9 @@ import mantle.blocks.BlockUtils;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.boss.EntityDragon;
-import net.minecraft.entity.boss.IBossDisplayData;
-import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.monster.EntityCreeper;
-import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.monster.EntitySkeleton;
import net.minecraft.entity.monster.EntityZombie;
-import net.minecraft.entity.monster.IMob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.init.Blocks;
@@ -26,7 +21,6 @@ import net.minecraftforge.event.entity.living.LivingAttackEvent;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent;
import tconstruct.TConstruct;
-import tconstruct.armor.TinkerArmor;
import tconstruct.armor.player.TPlayerStats;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.event.PartBuilderEvent;
@@ -39,10 +33,8 @@ import tconstruct.library.tools.BowMaterial;
import tconstruct.library.tools.BowstringMaterial;
import tconstruct.library.tools.FletchingMaterial;
import tconstruct.library.tools.ToolCore;
-import tconstruct.smeltery.TinkerSmeltery;
import tconstruct.util.ItemHelper;
import tconstruct.util.config.PHConstruct;
-import tconstruct.world.entity.BlueSlime;
import cpw.mods.fml.common.eventhandler.Event.Result;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java
index 533eb0af..9c06bf6d 100644
--- a/src/main/java/tconstruct/tools/TinkerTools.java
+++ b/src/main/java/tconstruct/tools/TinkerTools.java
@@ -756,7 +756,7 @@ public class TinkerTools
GameRegistry.addRecipe(new ItemStack(TinkerTools.craftingSlabWood, 1, 5), "b", 'b', new ItemStack(TinkerTools.toolForge, 1, Short.MAX_VALUE));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 1, 41), "dustArdite", "dustCobalt"));
- GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 4, 42), "dustAluminium", "dustCopper", "dustCopper", "dustCopper"));
+ GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(TinkerTools.materials, 4, 42), "dustAluminium", "dustAluminium", "dustAluminium", "dustCopper"));
}
private void modIntegration()
diff --git a/src/main/java/tconstruct/tools/ToolProxyCommon.java b/src/main/java/tconstruct/tools/ToolProxyCommon.java
index f761f4f4..709a559a 100644
--- a/src/main/java/tconstruct/tools/ToolProxyCommon.java
+++ b/src/main/java/tconstruct/tools/ToolProxyCommon.java
@@ -1,11 +1,10 @@
package tconstruct.tools;
-import tconstruct.common.TProxyCommon;
import mantle.blocks.abstracts.InventoryLogic;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
+import tconstruct.common.TProxyCommon;
import cpw.mods.fml.common.network.IGuiHandler;
public class ToolProxyCommon implements IGuiHandler
diff --git a/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java b/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java
index e29d0666..7e57fec0 100644
--- a/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java
+++ b/src/main/java/tconstruct/tools/inventory/SlotCraftingStation.java
@@ -4,7 +4,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.SlotCrafting;
import net.minecraft.item.ItemStack;
-import tconstruct.TConstruct;
import tconstruct.library.modifier.IModifyable;
import tconstruct.library.tools.AbilityHelper;
diff --git a/src/main/java/tconstruct/tools/inventory/SlotTool.java b/src/main/java/tconstruct/tools/inventory/SlotTool.java
index 96d955f3..7b4547e8 100644
--- a/src/main/java/tconstruct/tools/inventory/SlotTool.java
+++ b/src/main/java/tconstruct/tools/inventory/SlotTool.java
@@ -1,15 +1,15 @@
package tconstruct.tools.inventory;
import java.util.Random;
+
import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.*;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.MinecraftForge;
-import tconstruct.TConstruct;
import tconstruct.library.event.ToolCraftedEvent;
import tconstruct.library.modifier.IModifyable;
-import tconstruct.library.tools.ToolCore;
public class SlotTool extends Slot
{
diff --git a/src/main/java/tconstruct/tools/logic/BattlesignLogic.java b/src/main/java/tconstruct/tools/logic/BattlesignLogic.java
index 16da8371..2cdd4c93 100644
--- a/src/main/java/tconstruct/tools/logic/BattlesignLogic.java
+++ b/src/main/java/tconstruct/tools/logic/BattlesignLogic.java
@@ -1,21 +1,9 @@
package tconstruct.tools.logic;
-import tconstruct.tools.inventory.FrypanContainer;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemFood;
-import net.minecraft.item.ItemHoe;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.ItemSword;
-import net.minecraft.item.ItemTool;
-import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
-import cpw.mods.fml.common.registry.GameRegistry;
/* Slots
* 0: Battlesign item
diff --git a/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java b/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java
index 0422af01..36d58701 100644
--- a/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java
+++ b/src/main/java/tconstruct/util/DamageSourceFireworkExplode.java
@@ -1,6 +1,7 @@
package tconstruct.util;
import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.DamageSource;
import net.minecraft.util.IChatComponent;
@@ -16,7 +17,7 @@ public class DamageSourceFireworkExplode extends DamageSource
@Override
public IChatComponent func_151519_b (EntityLivingBase par1EntityLivingBase)
{
- return super.func_151519_b(par1EntityLivingBase);
+ return new ChatComponentTranslation("death.attack.FireworkExplode", par1EntityLivingBase.func_145748_c_());
}
}
diff --git a/src/main/java/tconstruct/util/DamageSourceLandmine.java b/src/main/java/tconstruct/util/DamageSourceLandmine.java
index a76dc0b0..eae39313 100644
--- a/src/main/java/tconstruct/util/DamageSourceLandmine.java
+++ b/src/main/java/tconstruct/util/DamageSourceLandmine.java
@@ -1,6 +1,7 @@
package tconstruct.util;
import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.DamageSource;
import net.minecraft.util.IChatComponent;
@@ -16,8 +17,6 @@ public class DamageSourceLandmine extends DamageSource
@Override
public IChatComponent func_151519_b (EntityLivingBase par1EntityLivingBase)
{
- // TODO getDeathMessage????
- return super.func_151519_b(par1EntityLivingBase);
+ return new ChatComponentTranslation("death.attack.Landmine", par1EntityLivingBase.func_145748_c_());
}
-
}
diff --git a/src/main/java/tconstruct/util/ItemHelper.java b/src/main/java/tconstruct/util/ItemHelper.java
index 1150e20b..ba55f09f 100644
--- a/src/main/java/tconstruct/util/ItemHelper.java
+++ b/src/main/java/tconstruct/util/ItemHelper.java
@@ -1,10 +1,6 @@
package tconstruct.util;
import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.List;
-
-import org.lwjgl.opengl.GL11;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
@@ -14,9 +10,11 @@ import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.ShapedRecipes;
import net.minecraft.util.IIcon;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
+
+import org.lwjgl.opengl.GL11;
+
import tconstruct.TConstruct;
public class ItemHelper
diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java
index 105c54da..6377c03e 100644
--- a/src/main/java/tconstruct/util/config/PHConstruct.java
+++ b/src/main/java/tconstruct/util/config/PHConstruct.java
@@ -1,14 +1,12 @@
package tconstruct.util.config;
import java.io.File;
-import java.io.IOException;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import tconstruct.TConstruct;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.tools.TinkerTools;
-import cpw.mods.fml.common.Loader;
public class PHConstruct
{
diff --git a/src/main/java/tconstruct/util/network/GogglePacket.java b/src/main/java/tconstruct/util/network/GogglePacket.java
index 2d38a742..59b163f3 100644
--- a/src/main/java/tconstruct/util/network/GogglePacket.java
+++ b/src/main/java/tconstruct/util/network/GogglePacket.java
@@ -5,7 +5,6 @@ import io.netty.channel.ChannelHandlerContext;
import mantle.common.network.AbstractPacket;
import net.minecraft.entity.player.EntityPlayer;
import tconstruct.armor.PlayerAbilityHelper;
-import tconstruct.armor.player.TPlayerStats;
public class GogglePacket extends AbstractPacket
{
diff --git a/src/main/java/tconstruct/util/network/SmelteryPacket.java b/src/main/java/tconstruct/util/network/SmelteryPacket.java
index 96157a23..185051c7 100644
--- a/src/main/java/tconstruct/util/network/SmelteryPacket.java
+++ b/src/main/java/tconstruct/util/network/SmelteryPacket.java
@@ -1,6 +1,5 @@
package tconstruct.util.network;
-import cpw.mods.fml.common.FMLCommonHandler;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import mantle.common.network.AbstractPacket;
diff --git a/src/main/java/tconstruct/world/TinkerWorldEvents.java b/src/main/java/tconstruct/world/TinkerWorldEvents.java
index de33ef77..b9b6dd8d 100644
--- a/src/main/java/tconstruct/world/TinkerWorldEvents.java
+++ b/src/main/java/tconstruct/world/TinkerWorldEvents.java
@@ -4,21 +4,15 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IEntityLivingData;
-import net.minecraft.entity.boss.EntityDragon;
-import net.minecraft.entity.boss.IBossDisplayData;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.item.EntityXPOrb;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityGhast;
-import net.minecraft.entity.monster.EntitySkeleton;
import net.minecraft.entity.monster.EntitySpider;
-import net.minecraft.entity.monster.EntityZombie;
-import net.minecraft.entity.monster.IMob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.world.World;
@@ -27,12 +21,9 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent;
import net.minecraftforge.event.entity.living.LivingSpawnEvent;
import net.minecraftforge.event.entity.player.BonemealEvent;
import tconstruct.TConstruct;
-import tconstruct.armor.TinkerArmor;
-import tconstruct.library.tools.ToolCore;
import tconstruct.tools.TinkerTools;
import tconstruct.util.ItemHelper;
import tconstruct.util.config.PHConstruct;
-import tconstruct.world.entity.BlueSlime;
import cpw.mods.fml.common.eventhandler.Event;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
diff --git a/src/main/java/tconstruct/world/blocks/GravelOre.java b/src/main/java/tconstruct/world/blocks/GravelOre.java
index 7e8ff64c..571804ea 100644
--- a/src/main/java/tconstruct/world/blocks/GravelOre.java
+++ b/src/main/java/tconstruct/world/blocks/GravelOre.java
@@ -3,18 +3,17 @@ package tconstruct.world.blocks;
import java.util.List;
import java.util.Random;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import tconstruct.library.TConstructRegistry;
-import tconstruct.world.TinkerWorld;
import net.minecraft.block.BlockSand;
-import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import tconstruct.library.TConstructRegistry;
+import tconstruct.world.TinkerWorld;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
public class GravelOre extends BlockSand
{
diff --git a/src/main/java/tconstruct/world/blocks/OreberryBush.java b/src/main/java/tconstruct/world/blocks/OreberryBush.java
index 0b827b0f..2499e519 100644
--- a/src/main/java/tconstruct/world/blocks/OreberryBush.java
+++ b/src/main/java/tconstruct/world/blocks/OreberryBush.java
@@ -6,6 +6,7 @@ import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
import net.minecraft.block.material.Material;
+import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
@@ -74,6 +75,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable
@Override
public IIcon getIcon (int side, int metadata)
{
+ this.setGraphicsLevel(Minecraft.getMinecraft().gameSettings.fancyGraphics);
if (field_150121_P)
{
if (metadata < 12)
diff --git a/src/main/java/tconstruct/world/blocks/StoneTorch.java b/src/main/java/tconstruct/world/blocks/StoneTorch.java
index e121c485..4fd992b5 100644
--- a/src/main/java/tconstruct/world/blocks/StoneTorch.java
+++ b/src/main/java/tconstruct/world/blocks/StoneTorch.java
@@ -8,7 +8,6 @@ import static net.minecraftforge.common.util.ForgeDirection.WEST;
import java.util.Random;
import mantle.blocks.MantleBlock;
-import mantle.world.WorldHelper;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
diff --git a/src/main/java/tconstruct/world/items/SpecialFood.java b/src/main/java/tconstruct/world/items/SpecialFood.java
index 33f5c244..0e9a3bde 100644
--- a/src/main/java/tconstruct/world/items/SpecialFood.java
+++ b/src/main/java/tconstruct/world/items/SpecialFood.java
@@ -4,13 +4,11 @@ import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;