Updating the mod with a working gradle

This commit is contained in:
kitsushadow
2016-12-08 21:04:58 -05:00
parent 0c4ffc048f
commit 7a7d22d122
6 changed files with 211 additions and 24 deletions

1
.gitignore vendored
View File

@@ -20,4 +20,3 @@ build
# other
eclipse
run
out

View File

View File

@@ -12,8 +12,8 @@ apply plugin: 'net.minecraftforge.gradle.forge'
version = "1.0"
group= "nmd.primal.forgecraft" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "forgecraft"
group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "modid"
sourceCompatibility = targetCompatibility = "1.6" // Need this here so eclipse task generates correctly.
compileJava {
@@ -21,9 +21,9 @@ compileJava {
}
minecraft {
version = "1.10.2-12.18.2.2151"
version = "1.10.2-12.18.3.2185"
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.
@@ -38,7 +38,7 @@ dependencies {
// or you may define them like so..
//compile "some.group:artifact:version:classifier"
//compile "some.group:artifact:version"
// real examples
//compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env
//compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
@@ -58,21 +58,21 @@ dependencies {
}
processResources
{
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
{
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
// replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
// replace version and mcversion
expand 'version':project.version, 'mcversion':project.minecraft.version
}
// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}

View File

@@ -1,5 +1,190 @@
Changelog:
Build 2151:
Build 2185:
LexManos: Bump version number for new Recommended Build.
Build 1.11-13.19.0.2184:
LexManos:
Prevent a crash when scheduling block updates for non-existing blocks
#3485
Build 1.10.2-12.18.2.2183:
LexManos:
Prevent a crash when scheduling block updates for non-existing blocks
#3485
Build 1.10.2-12.18.2.2182:
LexManos:
Make Container.mergeItemStack respect target slot's max size when slot
is non-empty. Closes #3498 Fix Shift clicking in Beacons with stacked
items when fuel slot is empty.
(cherry picked from commit c6bc4ec5a92b640ebe773bfa48732dfa7eb59a17)
LexManos:
Fix NPE when rendering missing mod screen with version bound
requirements. #3501
(cherry picked from commit c1e832bff09c949bfe736f492c2e4aa8004baa84)
LexManos:
Fix issue reading chunks from the network when client and server do not
agree on block count. Closes #34925
(cherry picked from commit daf21e4dcf246cfa15c362800effc5dc787ab777)
Build 1.11-13.19.0.2181:
LexManos: Make sure to log kick messages in NetworkDispatcher. Closes #3507
LexManos:
Fix NPE when rendering missing mod screen with version bound
requirements. #3501
LexManos:
Added isItemValidForSlot check to hopper extraction (#3444)
(cherry picked from commit 0348760a774ca7ed9639376baadae38e272f5bf8)
LexManos:
Fix for showing config default values twice in tooltip (#2257) (#3338)
(cherry picked from commit be73ec3d5ebd972cfacb0f255f71112a0430bc43)
LexManos:
Add null check and informative error message when client receives an
invalid update packet (#3266)
(cherry picked from commit 882e0e3bf22784d693e3816b0efeba5fbedb1a22)
LexManos:
Add ItemBlockSpecial#getBlock (#3343)
(cherry picked from commit cf26f4acbe48ee8790edc03d0b5c16c1167278ab)
LexManos:
Added gradle.properties to MDK (#3361)
The file sets the default max heap size to 3 GiB so that the
decompilation doesn't fail as often.
(cherry picked from commit 49ec3d1b9322ee2b7a1312059118173b0b3fe6d0)
LexManos:
Make SlotItemHandler override Slot.getSlotStackLimit. Closes #3497 Make
Container.mergeItemStack respect target slot's max size when slot is
non-empty. Closes #3498 Fix Shift clicking in Beacons with stacked items
when fuel slot is empty.
LexManos: Restore missed patch in World.updateComparatorOutputLevel. Closes #3495
LexManos:
Fix issue reading chunks from the network when client and server do not
agree on block count. Closes #34925
Build 1.11-13.19.0.2180:
diesieben07: Add missing pooled BlockPos retain in World patch (#3486)
mezz:
Add a way for modded GuiScreens to cancel mouse and keyboard events
(#3438)
blay09:
[1.11] Add canApplyAtEnchantmentTable to Item (#3463)
Allowing increased control of which enchantments can be put on an item
over Vanilla's hard-coded item type checks.
disabled when the item is enchantable but the enchantability requirement
is not met on lower levels.
mezz: [1.11] Add biome dictionary types for newer biomes (#3475)
bs2609: [1.11] Fix null checks in shouldCauseReequipAnimation (#3482)
Build 1.10.2-12.18.2.2179:
blay09:
Add null check and informative error message when client receives an
invalid update packet (#3266)
raoulvdberge: Add ItemBlockSpecial#getBlock (#3343)
yannick:
Added gradle.properties to MDK (#3361)
The file sets the default max heap size to 3 GiB so that the
decompilation doesn't fail as often.
Build 1.11-13.19.0.2178:
liach: Moved TextureStitchEvent.Pre to allow custom sprites for blocks (#3436)
Build 1.11-13.19.0.2177:
bs2609: Fix sky colour blending not working for render distances >16 (#3476)
Build 1.11-13.19.0.2176:
logictechcorp: Allow connectable blocks to choose what they can connect to (#3437)
Build 1.11-13.19.0.2175:
dawn0966: Changed Armor Material to use an ItemStack aware version (#3469)
Build 1.11-13.19.0.2174:
bs2609: Fix Redstone Torch memory leak (#3474)
Build 1.11-13.19.0.2173:
diesieben07: BiomeDictionary code cleanup (#3466)
Build 1.11-13.19.0.2172:
TechnicianLP: Added EquipmentChangeEvent (#3411)
Build 1.10.2-12.18.2.2171:
bs2609: Fix Redstone Torch memory leak (#3271)
Build 1.10.2-12.18.2.2170:
1vInc: Fix for showing config default values twice in tooltip (#2257) (#3338)
Build 1.11-13.19.0.2169:
marvinroesch99: Update assets to new Forge brand (#3464)
Build 1.11-13.19.0.2168:
LexManos:
First pass at exposing data fixers to modders. Each mod gets its own
version number, mods SHOULD NOT rely on other mod's fixers, just care
about yourself. Walkers can use IDataFixerData to retrieve their
version.
Build 1.11-13.19.0.2167:
williewillus: Add getSlotLimit(slot) to IItemHandler (#3445)
Build 1.10.2-12.18.2.2166:
draco18s: Added isItemValidForSlot check to hopper extraction (#3444)
Build 1.11-13.19.0.2165:
mezz: Provide access to GuiContainer location and dimensions (#3440)
kashike:
Add method to check if an Entity can trample a Block. Fixes #2510
(#2730)
cpw:
Pass along if the respawn event was the result of the end being
conquered or not (end respawning is really FUNKY code and uses death
instead of 'change dimension')
Build 1.11-13.19.0.2162:
bs2609: Clean up handling of changes to IVertexConsumer (#3458)
Build 1.11-13.19.0.2161:
bs2609: Quick fix for another ItemStack null check (#3426)
mezz: Provide access to ShapedOreRecipe width and height (#3439)
Build 1.11-13.19.0.2160:
cpw:
Fix problem with the server hanging around after forcing the client to
exit, leaving behind stale processes.
Build 1.11-13.19.0.2159:
mezz:
Fix #3432 Hopper and Dropper item moving does not exactly match vanilla
(#3442)
mezz: Fix using the wrong Pair implementation (#3449)
Build 1.11-13.19.0.2157:
mezz: Fix #3424 ItemCraftedEvent returns air when shift-clicking (#3441)
Build 1.11-13.19.0.2156:
mezz:
Cleanup some null checks and remove deprecated methods in Item and Block
(#3429)
Build 1.11-13.19.0.2155:
LexManos: Make all tests one side only, so we can test vanilla clients in dev env.
LexManos:
Insert FML packet handler into Vanilla pipelines in case modders send
FMLPacket to vanilla. Fixes #3422
LexManos: Fix max CustomPayload size, 1MB not 16MB.
Build 1.11-13.19.0.2154:
LexManos: Fix AbstractMethodException in FML Registries. Closes #3427
Build 1.11-13.19.0.2153:
shadowfacts:
Move EntityHorse capability patches to AbstractHorse (#3417)
Fixes #3409
LexManos: Fix ItemStack null check in PlayerInteractionManager
Build 1.11-13.19.0.2152:
shadowfacts: Initial annotations/nullability changes (#3392)
TechnicianLP: Remove Block.addInformation exists in vanilla (#3413)
LexManos: Fix Item transfers related to Hoppers.
Build 1.10.2-12.18.2.2151:
ohai.iChun:
Add GetCollisionBoxesEvent. Allows manipulation of the collision boxes
for moving entities and entities stuck in walls. (#3397)

3
gradle.properties Normal file
View File

@@ -0,0 +1,3 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB