Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tterrag1098/CustomThings
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Project-Diana/CustomThings
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 5 commits
  • 62 files changed
  • 1 contributor

Commits on Jul 28, 2023

  1. Initial migration to GTNH buildscript and RFG, also RG. Still needs s…

    …omething done about DifficultyRecipes dependency
    Cleptomania committed Jul 28, 2023
    Copy the full SHA
    e505872 View commit details
  2. Copy the full SHA
    823d561 View commit details
  3. Add jitpack maven

    Cleptomania committed Jul 28, 2023
    Copy the full SHA
    81dc347 View commit details
  4. Copy the full SHA
    f43959c View commit details

Commits on Jul 29, 2023

  1. Update DifficultyRecipes to version without ttcore dependency(enderco…

    …re gets mad about ttcore)
    Cleptomania committed Jul 29, 2023
    Copy the full SHA
    15aed42 View commit details
Showing with 3,115 additions and 1,445 deletions.
  1. +22 −0 .editorconfig
  2. +44 −0 .gitattributes
  3. +13 −0 .github/workflows/build-and-test.yml
  4. +14 −0 .github/workflows/release-tags.yml
  5. +37 −15 .gitignore
  6. +1,537 −64 build.gradle
  7. +43 −0 dependencies.gradle
  8. +146 −8 gradle.properties
  9. BIN gradle/wrapper/gradle-wrapper.jar
  10. +3 −2 gradle/wrapper/gradle-wrapper.properties
  11. +197 −113 gradlew
  12. +34 −32 gradlew.bat
  13. +2 −0 jitpack.yml
  14. +5 −0 repositories.gradle
  15. +28 −0 settings.gradle
  16. +21 −29 src/main/java/tterrag/customthings/CustomThings.java
  17. +9 −11 src/main/java/tterrag/customthings/common/block/BlockCustom.java
  18. +7 −9 src/main/java/tterrag/customthings/common/block/BlockCustomFalling.java
  19. +8 −10 src/main/java/tterrag/customthings/common/block/BlockCustomFence.java
  20. +3 −4 src/main/java/tterrag/customthings/common/block/BlockCustomRotatable.java
  21. +29 −29 src/main/java/tterrag/customthings/common/block/BlockCustomSlab.java
  22. +19 −28 src/main/java/tterrag/customthings/common/block/BlockCustomStairs.java
  23. +9 −10 src/main/java/tterrag/customthings/common/block/BlockCustomWall.java
  24. +49 −77 src/main/java/tterrag/customthings/common/block/BlockProxy.java
  25. +7 −6 src/main/java/tterrag/customthings/common/block/IBlockCustom.java
  26. +12 −17 src/main/java/tterrag/customthings/common/command/CommandCustomThings.java
  27. +12 −17 src/main/java/tterrag/customthings/common/compat/CompatUtil.java
  28. +131 −92 src/main/java/tterrag/customthings/common/config/ConfigHandler.java
  29. +90 −116 src/main/java/tterrag/customthings/common/config/json/AchievementType.java
  30. +69 −98 src/main/java/tterrag/customthings/common/config/json/BlockType.java
  31. +2 −2 src/main/java/tterrag/customthings/common/config/json/IHasMaterial.java
  32. +3 −3 src/main/java/tterrag/customthings/common/config/json/IJsonType.java
  33. +4 −5 src/main/java/tterrag/customthings/common/config/json/JsonType.java
  34. +26 −45 src/main/java/tterrag/customthings/common/config/json/crafting/ShapedJsonRecipe.java
  35. +13 −18 src/main/java/tterrag/customthings/common/config/json/crafting/ShapelessJsonRecipe.java
  36. +14 −18 src/main/java/tterrag/customthings/common/config/json/crafting/SmeltingJsonRecipe.java
  37. +16 −17 ...terrag/customthings/common/config/json/crafting/difficultyrecipes/ShapedJsonDifficultyRecipe.java
  38. +16 −17 ...rag/customthings/common/config/json/crafting/difficultyrecipes/ShapelessJsonDifficultyRecipe.java
  39. +20 −30 src/main/java/tterrag/customthings/common/config/json/items/ArmorType.java
  40. +19 −33 src/main/java/tterrag/customthings/common/config/json/items/ItemType.java
  41. +20 −29 src/main/java/tterrag/customthings/common/config/json/items/RecordType.java
  42. +77 −88 src/main/java/tterrag/customthings/common/config/json/items/ToolType.java
  43. +57 −52 src/main/java/tterrag/customthings/common/handlers/AchievementHandler.java
  44. +10 −12 src/main/java/tterrag/customthings/common/handlers/BreakSpeedFixer.java
  45. +8 −11 src/main/java/tterrag/customthings/common/handlers/FuelHandler.java
  46. +19 −34 src/main/java/tterrag/customthings/common/handlers/LivingDropsHandler.java
  47. +6 −9 src/main/java/tterrag/customthings/common/handlers/TooltipHandler.java
  48. +3 −2 src/main/java/tterrag/customthings/common/item/ICustomItem.java
  49. +1 −2 src/main/java/tterrag/customthings/common/item/ICustomRepair.java
  50. +9 −13 src/main/java/tterrag/customthings/common/item/ItemBlockCustom.java
  51. +11 −13 src/main/java/tterrag/customthings/common/item/ItemBlockCustomSlab.java
  52. +16 −24 src/main/java/tterrag/customthings/common/item/ItemCustom.java
  53. +25 −29 src/main/java/tterrag/customthings/common/item/ItemCustomArmor.java
  54. +10 −12 src/main/java/tterrag/customthings/common/item/ItemCustomAxe.java
  55. +9 −11 src/main/java/tterrag/customthings/common/item/ItemCustomHoe.java
  56. +13 −20 src/main/java/tterrag/customthings/common/item/ItemCustomPickaxe.java
  57. +22 −28 src/main/java/tterrag/customthings/common/item/ItemCustomRecord.java
  58. +10 −12 src/main/java/tterrag/customthings/common/item/ItemCustomShovel.java
  59. +10 −12 src/main/java/tterrag/customthings/common/item/ItemCustomSword.java
  60. +15 −22 src/main/java/tterrag/customthings/common/item/ItemProxy.java
  61. +15 −20 src/main/java/tterrag/customthings/common/nei/NEIHider.java
  62. +16 −15 src/main/resources/mcmod.info
22 changes: 22 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# This is the universal Text Editor Configuration
# for all GTNewHorizons projects
# See: https://editorconfig.org/

root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.{bat,ini}]
end_of_line = crlf

[*.{dtd,json,info,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml}]
indent_size = 2

[*.lang]
trim_trailing_whitespace = false
44 changes: 44 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
* text eol=lf

*.[jJ][aA][rR] binary

*.[pP][nN][gG] binary
*.[jJ][pP][gG] binary
*.[jJ][pP][eE][gG] binary
*.[gG][iI][fF] binary
*.[tT][iI][fF] binary
*.[tT][iI][fF][fF] binary
*.[iI][cC][oO] binary
*.[sS][vV][gG] text
*.[eE][pP][sS] binary
*.[xX][cC][fF] binary

*.[kK][aA][rR] binary
*.[mM]4[aA] binary
*.[mM][iI][dD] binary
*.[mM][iI][dD][iI] binary
*.[mM][pP]3 binary
*.[oO][gG][gG] binary
*.[rR][aA] binary

*.7[zZ] binary
*.[gG][zZ] binary
*.[tT][aA][rR] binary
*.[tT][gG][zZ] binary
*.[zZ][iI][pP] binary

*.[tT][cC][nN] binary
*.[sS][oO] binary
*.[dD][lL][lL] binary
*.[dD][yY][lL][iI][bB] binary
*.[pP][sS][dD] binary
*.[tT][tT][fF] binary
*.[oO][tT][fF] binary

*.[pP][aA][tT][cC][hH] -text

*.[bB][aA][tT] text eol=crlf
*.[cC][mM][dD] text eol=crlf
*.[pP][sS]1 text eol=crlf

*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary
13 changes: 13 additions & 0 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@

name: Build and test

on:
pull_request:
branches: [ master, main ]
push:
branches: [ master, main ]

jobs:
build-and-test:
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master
secrets: inherit
14 changes: 14 additions & 0 deletions .github/workflows/release-tags.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

name: Release tagged build

on:
push:
tags: [ '*' ]

permissions:
contents: write

jobs:
release-tags:
uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master
secrets: inherit
52 changes: 37 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,37 @@
*.class

# Package Files #
*.war
*.ear
/build
/eclipse
/bin

*.mtl
*.classpath
*.project
/.gradle
/.settings
/libs
.gradle
.settings
/.idea/
/.vscode/
/run/
/build/
/eclipse/
.classpath
.project
/bin/
/config/
/crash-reports/
/logs/
options.txt
/saves/
usernamecache.json
banned-ips.json
banned-players.json
eula.txt
ops.json
server.properties
servers.dat
usercache.json
whitelist.json
/out/
*.iml
*.ipr
*.iws
src/main/resources/mixins.*([!.]).json
*.bat
*.DS_Store
!gradlew.bat
.factorypath
addon.local.gradle
addon.local.gradle.kts
addon.late.local.gradle
addon.late.local.gradle.kts
Loading