Skip to content

Commit

Permalink
1.9.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Furgl committed Sep 2, 2016
1 parent 2591226 commit b1688dd
Show file tree
Hide file tree
Showing 36 changed files with 29,214 additions and 40,143 deletions.
107 changes: 54 additions & 53 deletions .classpath

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .gradle/2.7/taskArtifacts/cache.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#Sun Jun 26 18:37:28 CDT 2016
#Thu Sep 01 12:08:12 CDT 2016
Binary file modified .gradle/2.7/taskArtifacts/cache.properties.lock
Binary file not shown.
Binary file modified .gradle/2.7/taskArtifacts/fileHashes.bin
Binary file not shown.
Binary file modified .gradle/2.7/taskArtifacts/fileSnapshots.bin
Binary file not shown.
Binary file modified .gradle/2.7/taskArtifacts/outputFileStates.bin
Binary file not shown.
Binary file modified .gradle/2.7/taskArtifacts/taskArtifacts.bin
Binary file not shown.
8 changes: 4 additions & 4 deletions .gradle/gradle.log
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#################################################
ForgeGradle 2.1-SNAPSHOT-da90449
ForgeGradle 2.2-SNAPSHOT-c438b06
https://github.com/MinecraftForge/ForgeGradle
#################################################
Powered by MCP unknown
Expand All @@ -13,7 +13,7 @@
:compileApiJava UP-TO-DATE
:processApiResources UP-TO-DATE
:apiClasses UP-TO-DATE
:sourceMainJava UP-TO-DATE
:sourceMainJava
:compileJavawarning: [options] bootstrap class path not set in conjunction with -source 1.7
1 warning

Expand All @@ -32,7 +32,7 @@
:genSrgs SKIPPED
:reobfJar
:extractRangemapReplacedMain
C:\Users\Jake\Desktop\Modding\Jake's Modding\Improved Hoes 1.9\build\sources\main\java
C:\Users\Jake\Desktop\Modding\Jake's Modding\Improved Hoes 1.9.4\build\sources\main\java
:retromapReplacedMain
remapping source...
:sourceJar
Expand All @@ -42,4 +42,4 @@ remapping source...

BUILD SUCCESSFUL

Total time: 17.335 secs
Total time: 22.799 secs
2 changes: 1 addition & 1 deletion .project
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Tester 1.9</name>
<name>Improved Hoes 1.9.4</name>
<comment/>
<projects/>
<natures>
Expand Down
8 changes: 4 additions & 4 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#
#Sun Jun 26 18:43:23 CDT 2016
#Thu Sep 01 12:55:39 CDT 2016
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
Binary file modified bin/furgl/improvedHoes/UseHoeEvents.class
Binary file not shown.
2 changes: 1 addition & 1 deletion bin/mcmod.info
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "ImprovedHoes",
"description": "Improved Hoes makes farming with hoes much quicker and easier. Each type of hoe has a specific range of blocks that it can work with. Within this range, the hoe can till land, harvest crops, or harvest and replant crops. Shifting while using the hoe will operate the hoe normally.",
"version": "1.1",
"mcversion": "1.9",
"mcversion": "1.9.4",
"url": "https://sites.google.com/site/furglsmods/improved-hoes",
"updateUrl": "",
"authorList": ["Furgl"],
Expand Down
9 changes: 4 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
}
}
apply plugin: 'net.minecraftforge.gradle.forge'
Expand All @@ -20,24 +20,23 @@ plugins {
id "net.minecraftforge.gradle.forge" version "2.0.2"
}
*/
version = "1.9-1.1"
version = "1.9.4-1.1"
group= "furgl.improvedHoes" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "ImprovedHoes"

sourceCompatibility = 1.7
targetCompatibility = 1.7


minecraft {
version = "1.9-12.16.1.1887"
version = "1.9.4-12.17.0.1976"
runDir = "run"

// the mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD snapshot are built nightly.
// stable_# stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not allways work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = "snapshot_20160312"
mappings = "snapshot_20160518"
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
}

Expand Down
Binary file modified build/classes/main/furgl/improvedHoes/UseHoeEvents.class
Binary file not shown.
Binary file removed build/libs/ImprovedHoes-1.9-1.1-sources.jar
Binary file not shown.
Binary file removed build/libs/ImprovedHoes-1.9-1.1.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion build/resources/main/mcmod.info
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"name": "ImprovedHoes",
"description": "Improved Hoes makes farming with hoes much quicker and easier. Each type of hoe has a specific range of blocks that it can work with. Within this range, the hoe can till land, harvest crops, or harvest and replant crops. Shifting while using the hoe will operate the hoe normally.",
"version": "1.1",
"mcversion": "1.9",
"mcversion": "1.9.4",
"url": "https://sites.google.com/site/furglsmods/improved-hoes",
"updateUrl": "",
"authorList": ["Furgl"],
Expand Down
744 changes: 404 additions & 340 deletions build/retromapping/replacedMain.rangemap

Large diffs are not rendered by default.

Binary file modified build/retromapping/retromappedReplacedMain.jar
Binary file not shown.
13 changes: 7 additions & 6 deletions build/sources/main/java/furgl/improvedHoes/UseHoeEvents.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ private void rightClickDirt(UseHoeEvent event)
}
}

@SuppressWarnings("deprecation")
private boolean onItemUse(UseHoeEvent event, int x, int z)
{
if(event.getCurrent().getItemDamage() == 0 && !(x == -radius && z == -radius) && !event.getEntityPlayer().capabilities.isCreativeMode)
Expand All @@ -68,16 +69,16 @@ private boolean onItemUse(UseHoeEvent event, int x, int z)
Block block = iblockstate.getBlock();
if (EnumFacing.UP != EnumFacing.DOWN && event.getWorld().isAirBlock(event.getPos().add(x, 0, z).up()))
{
if (block == Blocks.grass)
return useHoe(event.getCurrent(), event.getEntityPlayer(), event.getWorld(), event.getPos().add(x, 0, z), Blocks.farmland.getStateFromMeta(1));
else if (block == Blocks.dirt)
if (block == Blocks.GRASS)
return useHoe(event.getCurrent(), event.getEntityPlayer(), event.getWorld(), event.getPos().add(x, 0, z), Blocks.FARMLAND.getStateFromMeta(1));
else if (block == Blocks.DIRT)
{
switch (TYPE_LOOKUP[((BlockDirt.DirtType)iblockstate.getValue(BlockDirt.VARIANT)).ordinal()])
{
case 1:
return useHoe(event.getCurrent(), event.getEntityPlayer(), event.getWorld(), event.getPos().add(x, 0, z), Blocks.farmland.getStateFromMeta(1));
return useHoe(event.getCurrent(), event.getEntityPlayer(), event.getWorld(), event.getPos().add(x, 0, z), Blocks.FARMLAND.getStateFromMeta(1));
case 2:
return useHoe(event.getCurrent(), event.getEntityPlayer(), event.getWorld(), event.getPos().add(x, 0, z), Blocks.dirt.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.DIRT));
return useHoe(event.getCurrent(), event.getEntityPlayer(), event.getWorld(), event.getPos().add(x, 0, z), Blocks.DIRT.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.DIRT));
}
}
}
Expand All @@ -87,7 +88,7 @@ else if (block == Blocks.dirt)

private boolean useHoe(ItemStack stack, EntityPlayer player, World worldIn, BlockPos pos, IBlockState state)
{
worldIn.playSound(player, pos, SoundEvents.item_hoe_till, SoundCategory.BLOCKS, 1.0F, 1.0F);
worldIn.playSound(player, pos, SoundEvents.ITEM_HOE_TILL, SoundCategory.BLOCKS, 1.0F, 1.0F);

if (!worldIn.isRemote)
{
Expand Down
32 changes: 24 additions & 8 deletions build/taskLogs/extractRangemapReplacedMain.log
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
Symbol range map extraction starting
Processing 8 files
processing furgl\improvedHoes\Config.java
processing furgl\improvedHoes\ConfigChangedEvents.java
processing furgl\improvedHoes\HarvestCheckEvents.java
processing furgl\improvedHoes\ImprovedHoes.java
processing furgl\improvedHoes\ImprovedHoesGuiConfig.java
processing furgl\improvedHoes\ImprovedHoesGuiFactory.java
processing furgl\improvedHoes\PlayerInteractEvents.java
processing furgl\improvedHoes\UseHoeEvents.java
startProcessing "furgl\improvedHoes\Config.java" md5: a670078756ed5426571776c2c22794e9
endProcessing "furgl\improvedHoes\Config.java"

startProcessing "furgl\improvedHoes\ConfigChangedEvents.java" md5: 19573e025ae7f638e15dcfc4b8d2c34d
endProcessing "furgl\improvedHoes\ConfigChangedEvents.java"

startProcessing "furgl\improvedHoes\HarvestCheckEvents.java" md5: dd9b042c58783a45465f536054dc18d7
endProcessing "furgl\improvedHoes\HarvestCheckEvents.java"

startProcessing "furgl\improvedHoes\ImprovedHoes.java" md5: d59846587620583cf30ffec678054b37
endProcessing "furgl\improvedHoes\ImprovedHoes.java"

startProcessing "furgl\improvedHoes\ImprovedHoesGuiConfig.java" md5: 569d27d4df3842182d8f7a4a15616bec
endProcessing "furgl\improvedHoes\ImprovedHoesGuiConfig.java"

startProcessing "furgl\improvedHoes\ImprovedHoesGuiFactory.java" md5: 09846497bc0b647d6ad082ecdf3e60f3
endProcessing "furgl\improvedHoes\ImprovedHoesGuiFactory.java"

startProcessing "furgl\improvedHoes\PlayerInteractEvents.java" md5: 365867c23a0258544456b20a94e07e1a
endProcessing "furgl\improvedHoes\PlayerInteractEvents.java"

startProcessing "furgl\improvedHoes\UseHoeEvents.java" md5: 3509f68ca4aa213e86deaea609b1fa52
endProcessing "furgl\improvedHoes\UseHoeEvents.java"

2 changes: 0 additions & 2 deletions build/taskLogs/extractRangemapSrc.log

This file was deleted.

Loading

0 comments on commit b1688dd

Please sign in to comment.