-
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'architectury-1.20' into architectury-1.20.2
- Loading branch information
Showing
23 changed files
with
1,005 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,6 @@ out/ | |
.gradle/ | ||
output/ | ||
bin/ | ||
libs/ | ||
|
||
.classpath | ||
.project | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 5 additions & 38 deletions
43
common/src/main/java/com/unlikepaladin/pfm/compat/imm_ptl/PFMImmersivePortals.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,44 +1,11 @@ | ||
package com.unlikepaladin.pfm.compat.imm_ptl; | ||
|
||
import com.unlikepaladin.pfm.compat.PFMClientModCompatibility; | ||
import com.unlikepaladin.pfm.compat.PFMModCompatibility; | ||
import com.unlikepaladin.pfm.compat.imm_ptl.client.PFMImmersivePortalsClient; | ||
import com.unlikepaladin.pfm.compat.imm_ptl.entity.PFMMirrorEntity; | ||
import com.unlikepaladin.pfm.registry.EntityRegistry; | ||
import com.unlikepaladin.pfm.registry.PaladinFurnitureModBlocksItems; | ||
import net.minecraft.block.AbstractBlock; | ||
import net.minecraft.block.MapColor; | ||
import net.minecraft.entity.EntityType; | ||
import net.minecraft.entity.SpawnGroup; | ||
import dev.architectury.injectables.annotations.ExpectPlatform; | ||
|
||
import java.util.Optional; | ||
|
||
public class PFMImmersivePortals implements PFMModCompatibility { | ||
private PFMClientModCompatibility clientModCompatibility; | ||
public PFMImmersivePortals(){ | ||
} | ||
public static final EntityType<PFMMirrorEntity> MIRROR = EntityType.Builder.create(PFMMirrorEntity::new, SpawnGroup.MISC).setDimensions(0.0F, 0.0F).makeFireImmune().disableSummon().build("mirror_entity"); | ||
|
||
@Override | ||
public void registerEntityTypes() { | ||
EntityRegistry.registerEntityType("mirror_entity", MIRROR); | ||
} | ||
|
||
@Override | ||
public void createBlocks() { | ||
PaladinFurnitureModBlocksItems.WHITE_MIRROR = new PFMMirrorBlockIP(AbstractBlock.Settings.create().mapColor(MapColor.WHITE).nonOpaque()); | ||
PaladinFurnitureModBlocksItems.GRAY_MIRROR = new PFMMirrorBlockIP(AbstractBlock.Settings.create().mapColor(MapColor.GRAY).nonOpaque()); | ||
} | ||
|
||
@Override | ||
public String getModId() { | ||
return "immersive_portals"; | ||
} | ||
|
||
@Override | ||
public Optional<PFMClientModCompatibility> getClientModCompatiblity() { | ||
if (clientModCompatibility == null) | ||
clientModCompatibility = new PFMImmersivePortalsClient(this); | ||
return Optional.of(clientModCompatibility); | ||
public class PFMImmersivePortals { | ||
@ExpectPlatform | ||
public static PFMModCompatibility getInstance() { | ||
throw new AssertionError(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
...ic/src/main/java/com/unlikepaladin/pfm/compat/imm_ptl/fabric/PFMImmersivePortalsImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
package com.unlikepaladin.pfm.compat.imm_ptl.fabric; | ||
|
||
import com.unlikepaladin.pfm.compat.PFMClientModCompatibility; | ||
import com.unlikepaladin.pfm.compat.PFMModCompatibility; | ||
import com.unlikepaladin.pfm.compat.imm_ptl.fabric.client.PFMImmersivePortalsClient; | ||
import com.unlikepaladin.pfm.compat.imm_ptl.fabric.entity.PFMMirrorEntity; | ||
import com.unlikepaladin.pfm.registry.EntityRegistry; | ||
import com.unlikepaladin.pfm.registry.PaladinFurnitureModBlocksItems; | ||
import net.minecraft.block.AbstractBlock; | ||
import net.minecraft.block.MapColor; | ||
import net.minecraft.entity.EntityType; | ||
import net.minecraft.entity.SpawnGroup; | ||
|
||
import java.util.Optional; | ||
|
||
public class PFMImmersivePortalsImpl implements PFMModCompatibility { | ||
private PFMClientModCompatibility clientModCompatibility; | ||
public static final EntityType<PFMMirrorEntity> MIRROR = EntityType.Builder.create(PFMMirrorEntity::new, SpawnGroup.MISC).setDimensions(0.0F, 0.0F).makeFireImmune().disableSummon().build("mirror_entity"); | ||
|
||
@Override | ||
public void registerEntityTypes() { | ||
EntityRegistry.registerEntityType("mirror_entity", MIRROR); | ||
} | ||
|
||
@Override | ||
public void createBlocks() { | ||
PaladinFurnitureModBlocksItems.WHITE_MIRROR = new PFMMirrorBlockIP(AbstractBlock.Settings.create().mapColor(MapColor.WHITE).nonOpaque()); | ||
PaladinFurnitureModBlocksItems.GRAY_MIRROR = new PFMMirrorBlockIP(AbstractBlock.Settings.create().mapColor(MapColor.GRAY).nonOpaque()); | ||
} | ||
|
||
@Override | ||
public String getModId() { | ||
return "immersive_portals"; | ||
} | ||
|
||
@Override | ||
public Optional<PFMClientModCompatibility> getClientModCompatiblity() { | ||
if (clientModCompatibility == null) | ||
clientModCompatibility = new PFMImmersivePortalsClient(this); | ||
return Optional.of(clientModCompatibility); | ||
} | ||
public static PFMModCompatibility getInstance() { | ||
return new PFMImmersivePortalsImpl(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...m_ptl/client/PFMMirrorEntityRenderer.java → ...abric/client/PFMMirrorEntityRenderer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.