diff --git a/.gitignore b/.gitignore index 0b588a8..7c623fd 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ build .gradle libs src/api +logs # other eclipse @@ -26,7 +27,4 @@ run # java *.class *.war -*.ear - -# Temp -src/main/java/me/ichun/mods/ichunutil/old \ No newline at end of file +*.ear \ No newline at end of file diff --git a/build.gradle b/build.gradle index 1136213..a9aa9d9 100644 --- a/build.gradle +++ b/build.gradle @@ -13,9 +13,9 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '9.0.1' +version = '10.0.0' group = 'tabula' -archivesBaseName = 'Tabula-1.16.1' +archivesBaseName = 'Tabula-1.16.3' sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. @@ -25,7 +25,7 @@ minecraft { // stable_# Stables are built at the discretion of the MCP team. // Use non-default mappings at your own risk. they may not always work. // Simply re-run your setup task after changing the mappings to update your workspace. - mappings channel: 'snapshot', version: '20200723-1.16.1' + mappings channel: 'snapshot', version: '20200916-1.16.2' // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. accessTransformer = file('src/api/resources/META-INF/accesstransformer.cfg') @@ -61,8 +61,8 @@ dependencies { // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. // The userdev artifact is a special name and will get all sorts of transformations applied to it. - minecraft 'net.minecraftforge:forge:1.16.1-32.0.75' - implementation fg.deobf("ichunutil:iChunUtil:9.0.0") + minecraft 'net.minecraftforge:forge:1.16.3-34.0.9' + implementation fg.deobf("ichunutil:iChunUtil:10.0.0") // You may put jars on which you depend on in ./libs or you may define them like so.. // compile "some.group:artifact:version:classifier" diff --git a/src/main/java/me/ichun/mods/tabula/client/core/EventHandlerClient.java b/src/main/java/me/ichun/mods/tabula/client/core/EventHandlerClient.java index bbfa1cf..1f8f973 100644 --- a/src/main/java/me/ichun/mods/tabula/client/core/EventHandlerClient.java +++ b/src/main/java/me/ichun/mods/tabula/client/core/EventHandlerClient.java @@ -62,7 +62,7 @@ public void onInitGuiPost(GuiScreenEvent.InitGuiEvent.Post event) Widget button = event.getWidgetList().get(i); if(!intersects) { - intersects = btn.intersects(new Rectangle(button.x, button.y, button.getWidth(), button.getHeight())); + intersects = btn.intersects(new Rectangle(button.x, button.y, button.getWidth(), button.getHeightRealms())); } } diff --git a/src/main/java/me/ichun/mods/tabula/client/gui/window/popup/WindowImportMCProject.java b/src/main/java/me/ichun/mods/tabula/client/gui/window/popup/WindowImportMCProject.java index 0f5d17a..4ccd77b 100644 --- a/src/main/java/me/ichun/mods/tabula/client/gui/window/popup/WindowImportMCProject.java +++ b/src/main/java/me/ichun/mods/tabula/client/gui/window/popup/WindowImportMCProject.java @@ -37,6 +37,7 @@ import net.minecraft.profiler.EmptyProfiler; import net.minecraft.resources.IResource; import net.minecraft.scoreboard.Scoreboard; +import net.minecraft.tags.ITagCollectionSupplier; import net.minecraft.tags.NetworkTagManager; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; @@ -44,6 +45,8 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.registry.DynamicRegistries; +import net.minecraft.util.registry.Registry; import net.minecraft.world.*; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biomes; @@ -141,6 +144,12 @@ public int getSpawnZ() return 0; } + @Override + public float getSpawnAngle() + { + return 0; + } + @Override public long getGameTime() { @@ -212,7 +221,19 @@ public void setSpawnZ(int z) { } - }, World.field_234918_g_, DimensionType.OVERWORLD, DimensionType.func_236019_a_(), () -> EmptyProfiler.INSTANCE, false, false, 0L) { + + @Override + public void setSpawnAngle(float angle) + { + + } + }, World.OVERWORLD, DimensionType.OVERWORLD_TYPE, () -> EmptyProfiler.INSTANCE, false, false, 0L) { + @Override + public DynamicRegistries func_241828_r() + { + return DynamicRegistries.func_239770_b_(); + } + @Override public float func_230487_a_(Direction p_230487_1_, boolean p_230487_2_) { @@ -252,7 +273,7 @@ public void sendBlockBreakProgress(int breakerId, BlockPos pos, int progress){} public RecipeManager getRecipeManager() { return new RecipeManager();} @Override - public NetworkTagManager getTags() { return new NetworkTagManager();} + public ITagCollectionSupplier getTags() { return ITagCollectionSupplier.TAG_COLLECTION_SUPPLIER;} @Override public ITickList getPendingBlockTicks() { return EmptyTickList.get();} @@ -275,7 +296,7 @@ public List getPlayers() @Override public Biome getNoiseBiomeRaw(int x, int y, int z) { - return Biomes.OCEAN; + return this.func_241828_r().getRegistry(Registry.BIOME_KEY).getOrThrow(Biomes.PLAINS); } }; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 75c3cab..df52108 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[32,)" #forge version dep +loaderVersion="[34,)" #forge version dep license="GNU Lesser General Public License v3.0" issueTrackerURL="https://github.com/iChun/Tabula/issues" @@ -16,6 +16,6 @@ issueTrackerURL="https://github.com/iChun/Tabula/issues" [[dependencies.tabula]] modId="ichunutil" mandatory=true - versionRange="[9.0.0,10)" + versionRange="[10.0.0,11)" ordering="NONE" side="BOTH" diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 02df7ff..7d15566 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack":{ - "pack_format":5, + "pack_format":6, "description":"Tabula" } } \ No newline at end of file