Skip to content

Commit

Permalink
Server & client mixin separation, swors item fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@paulevsGitch
paulevsGitch committed Mar 21, 2020
1 parent 686a311 commit 7764021
Show file tree
Hide file tree
Showing 23 changed files with 51 additions and 43 deletions.
30 changes: 14 additions & 16 deletions BetterNether_snapshots_server.launch
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/BetterNether_snapshots"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.buildship.core.classpathprovider"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.fabricmc.devlaunchinjector.Main"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value=""/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="BetterNether_snapshots"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dfabric.dli.config=D:\MC_BetterNether_1.15.1\BetterNether_snapshots\.gradle\loom-cache\launch.cfg -Dfabric.dli.env=server -Dfabric.dli.main=net.fabricmc.loader.launch.knot.KnotServer"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:BetterNether_snapshots}/run"/>
</launchConfiguration>
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/BetterNether_snapshots"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.fabricmc.devlaunchinjector.Main"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="BetterNether_snapshots"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dfabric.dli.config=D:\MC_BetterNether_1.15.1\BetterNether_snapshots\.gradle\loom-cache\launch.cfg -Dfabric.dli.env=server -Dfabric.dli.main=net.fabricmc.loader.launch.knot.KnotServer"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:BetterNether_snapshots}/run"/>
</launchConfiguration>
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G
loader_version=0.7.8+build.188

# Mod Properties
mod_version = 2.5.0
mod_version = 2.5.1
maven_group = paulevs.betternether
archives_base_name = better-nether

Expand Down
2 changes: 1 addition & 1 deletion ...ernether/mixin/BackgroundRenderMixin.java → ...r/mixin/client/BackgroundRenderMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.client;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
Expand Down
2 changes: 1 addition & 1 deletion ...vs/betternether/mixin/LavaFluidMixin.java → ...ernether/mixin/client/LavaFluidMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.client;

import java.util.Random;

Expand Down
2 changes: 1 addition & 1 deletion .../betternether/mixin/PlayerArmorMixin.java → ...nether/mixin/client/PlayerArmorMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.client;

import java.util.Iterator;

Expand Down
2 changes: 1 addition & 1 deletion ...s/betternether/mixin/StandArmorMixin.java → ...rnether/mixin/client/StandArmorMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.client;

import java.util.Iterator;

Expand Down
2 changes: 1 addition & 1 deletion ...s/betternether/mixin/BiomeArrayMixin.java → ...rnether/mixin/common/BiomeArrayMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.common;

import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
Expand Down
2 changes: 1 addition & 1 deletion ...aulevs/betternether/mixin/BiomeMixin.java → ...betternether/mixin/common/BiomeMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.common;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
Expand Down
2 changes: 1 addition & 1 deletion ...etternether/mixin/ChunkPopulateMixin.java → ...ther/mixin/common/ChunkPopulateMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.common;

import java.util.HashSet;

Expand Down
2 changes: 1 addition & 1 deletion ...vs/betternether/mixin/GrassGrowMixin.java → ...ernether/mixin/common/GrassGrowMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.common;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
Expand Down
2 changes: 1 addition & 1 deletion ...betternether/mixin/LightStorageMixin.java → ...ether/mixin/common/LightStorageMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.common;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
Expand Down
2 changes: 1 addition & 1 deletion ...ulevs/betternether/mixin/LocateMixin.java → ...etternether/mixin/common/LocateMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.common;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
Expand Down
2 changes: 1 addition & 1 deletion .../paulevs/betternether/mixin/MapMixin.java → ...s/betternether/mixin/common/MapMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.common;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
Expand Down
2 changes: 1 addition & 1 deletion ...evs/betternether/mixin/MapStateMixin.java → ...ternether/mixin/common/MapStateMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.common;

import java.util.Map;

Expand Down
2 changes: 1 addition & 1 deletion ...evs/betternether/mixin/MushroomMixin.java → ...ternether/mixin/common/MushroomMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.common;

import java.util.Random;

Expand Down
2 changes: 1 addition & 1 deletion ...s/betternether/mixin/NetherWartMixin.java → ...rnether/mixin/common/NetherWartMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.common;

import java.util.Random;

Expand Down
2 changes: 1 addition & 1 deletion ...betternether/mixin/PlayerEntityMixin.java → ...ether/mixin/common/PlayerEntityMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.common;

import java.util.Optional;

Expand Down
2 changes: 1 addition & 1 deletion ...vs/betternether/mixin/StructureMixin.java → ...ernether/mixin/common/StructureMixin.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package paulevs.betternether.mixin;
package paulevs.betternether.mixin.common;

import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/betternether/models/item/cincinnasite_sword.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "item/handheld",
"textures": {
"layer0": "betternether:item/cincinnasite_sword"
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/assets/betternether/models/item/cincinnasite_sword_diamond.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"parent": "item/generated",
"parent": "item/handheld",
"textures": {
"layer0": "betternether:item/cincinnasite_sword_diamond"
}
Expand Down
14 changes: 14 additions & 0 deletions src/main/resources/betternether.mixins.client.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"required": true,
"package": "paulevs.betternether.mixin.client",
"compatibilityLevel": "JAVA_8",
"client": [
"BackgroundRenderMixin",
"LavaFluidMixin",
"StandArmorMixin",
"PlayerArmorMixin"
],
"injectors": {
"defaultRequire": 1
}
}
9 changes: 2 additions & 7 deletions src/main/resources/betternether.mixins.json → ...resources/betternether.mixins.common.json
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,21 @@
{
"required": true,
"package": "paulevs.betternether.mixin",
"package": "paulevs.betternether.mixin.common",
"compatibilityLevel": "JAVA_8",
"mixins": [
"ChunkPopulateMixin",
"ChunkPopulateMixin",
"MushroomMixin",
"MapMixin",
"MapStateMixin",
"PlayerArmorMixin",
"StandArmorMixin",
"LocateMixin",
"GrassGrowMixin",
"StructureMixin",
"BackgroundRenderMixin",
"LightStorageMixin",
"NetherWartMixin",
"BiomeArrayMixin",
"BiomeMixin",
"LavaFluidMixin",
"PlayerEntityMixin"
],
"client": [],
"injectors": {
"defaultRequire": 1
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/fabric.mod.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
]
},
"mixins": [
"betternether.mixins.json"
"betternether.mixins.common.json",
"betternether.mixins.client.json"
],

"depends": {
Expand Down

0 comments on commit 7764021

Please sign in to comment.